From e3a995d0b8756aea5337707a86c166a407596fe7 Mon Sep 17 00:00:00 2001 From: Bojan Date: Tue, 31 Jan 2023 12:24:25 +0100 Subject: [PATCH] * Update dependencies. * Fix Koin backwards compatibility issues. --- CHANGELOG.md | 7 +++++++ README.md | 12 +++++------ config.gradle | 4 ++-- gradle/libs.versions.toml | 26 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- lint/build.gradle | 4 ++-- settings.gradle | 2 -- ui/build.gradle | 2 +- 8 files changed, 32 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f8411c5..7e57a453 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Change Log ========== +## Version 1.3.8 + +_2023-01-31_ + +* Update dependencies. +* Fix Koin backwards compatibility issues. + ## Version 1.3.7 _2022-08-24_ diff --git a/README.md b/README.md index 0907b209..cd7f77d9 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.infinum.collar:collar-plugin:1.3.7" + classpath "com.infinum.collar:collar-plugin:1.3.8" } } ``` @@ -42,7 +42,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.infinum.collar:collar-plugin:1.3.7") + classpath("com.infinum.collar:collar-plugin:1.3.8") } } ``` @@ -261,13 +261,13 @@ You can search, filter and clear all sent analytics. In your app `build.gradle` or `build.gradle.kts` add: **Groovy** ```gradle -debugImplementation "com.infinum.collar:collar-ui:1.3.7" -releaseImplementation "com.infinum.collar:collar-ui-no-op:1.3.7" +debugImplementation "com.infinum.collar:collar-ui:1.3.8" +releaseImplementation "com.infinum.collar:collar-ui-no-op:1.3.8" ``` **KotlinDSL** ```kotlin -debugImplementation("com.infinum.collar:collar-ui:1.3.7") -releaseImplementation("com.infinum.collar:collar-ui-no-op:1.3.7") +debugImplementation("com.infinum.collar:collar-ui:1.3.8") +releaseImplementation("com.infinum.collar:collar-ui-no-op:1.3.8") ``` In order to start tracking with UI you must use _LiveCollector_ as in this example: diff --git a/config.gradle b/config.gradle index a376bc80..a4434133 100644 --- a/config.gradle +++ b/config.gradle @@ -1,13 +1,13 @@ ext { def major = 1 def minor = 3 - def patch = 7 + def patch = 8 buildConfig = [ "minSdk" : 19, "compileSdk": 33, "targetSdk" : 33, - "buildTools": "33.0.0" + "buildTools": "33.0.1" ] releaseConfig = [ "group" : "com.infinum.collar", diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 31ab19f0..446589d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,29 +1,29 @@ [versions] -collar = "1.3.7" -gradle = "7.2.2" +collar = "1.3.8" +gradle = "7.3.1" lint = "30.2.1" -kotlin = "1.7.10" +kotlin = "1.7.21" coroutines = "1.6.4" -serialization = "1.3.3" +serialization = "1.4.1" poet = "1.12.0" -annotations = "23.0.0" -core = "1.8.0" -appcompat = "1.4.2" -activity = "1.5.1" -fragment = "1.5.1" +annotations = "24.0.0" +core = "1.9.0" +appcompat = "1.6.0" +activity = "1.6.1" +fragment = "1.5.5" lifecycle = "2.5.1" recyclerview = "1.2.1" -room = "2.4.3" +room = "2.5.0" startup = "1.1.1" dynamicanimation = "1.0.0" -design = "1.6.1" -koin = "3.2.0" +design = "1.8.0" +koin = "3.3.2" timber = "5.0.1" detekt = "1.21.0" ktlintplugin = "10.3.0" ktlint = "0.45.2" cpd = "3.2" -dokka = "1.7.10" +dokka = "1.7.20" [libraries] libraryannotations = { module = "com.infinum.collar:collar-annotations", version.ref = "collar" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fce..070cb702 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/lint/build.gradle b/lint/build.gradle index 5535ebe3..762f9843 100644 --- a/lint/build.gradle +++ b/lint/build.gradle @@ -40,8 +40,8 @@ dependencies { compileOnly libs.tools.lintchecks testImplementation 'junit:junit:4.13.2' - testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.2" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.2" + testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2" testImplementation libs.tools.lintapi testImplementation libs.tools.lintchecks testImplementation libs.tools.linttests diff --git a/settings.gradle b/settings.gradle index ce66ad9b..b3f0aba9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,3 @@ -enableFeaturePreview("VERSION_CATALOGS") - rootProject.name = "Collar" include ":core", ":plugin", ":annotations", ":processor", ":ui", ":ui-no-op", ":generator", ":lint", ":sample" \ No newline at end of file diff --git a/ui/build.gradle b/ui/build.gradle index 5d9b62a5..28a6ba07 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -1,7 +1,7 @@ plugins { id "com.android.library" id "kotlin-android" - id "com.google.devtools.ksp" version "1.7.10-1.0.6" + id "com.google.devtools.ksp" version "1.7.21-1.0.8" } android {