Merge branch 'develop'

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_

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:

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",

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" }

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

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

settings.gradle

@@ -1,5 +1,3 @@
-enableFeaturePreview("VERSION_CATALOGS")
-
 rootProject.name = "Collar"
 
 include ":core", ":plugin", ":annotations", ":processor", ":ui", ":ui-no-op", ":generator", ":lint", ":sample"

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 {