Merge pull request #665 from qonversion/tech/sc-38454/publishFix

Updated JVM compatibility and Kotlin version to fix publishing.

Author: SpertsyanKM

build.gradle

@@ -10,7 +10,7 @@ buildscript {
                 versionCode: 1
         ]
     }
-    ext.kotlin_version = '1.8.22'
+    ext.kotlin_version = '1.9.25'
     repositories {
         mavenCentral()
         google()

sdk/build.gradle

@@ -19,10 +19,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    kotlinOptions {
-        jvmTarget = '18'
-    }
-
     buildTypes {
         buildTypes.each {
             it.buildConfigField("String","VERSION_NAME", "\"${defaultConfig.versionName}\"")
@@ -33,9 +29,8 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_18
+    kotlin {
+        jvmToolchain(18)
     }
 
     testOptions {
@@ -67,7 +62,7 @@ ext {
     PUBLISH_GROUP_ID = 'io.qonversion.android.sdk'
     PUBLISH_ARTIFACT_ID = 'sdk'
 
-    moshiVersion = '1.14.0'
+    moshiVersion = '1.15.2'
     retrofit_version = '2.9.0'
     okhttp_version = '3.12.13'
     billing = '7.0.0'

sdk/src/test/java/com/qonversion/android/sdk/internal/QIdentityManagerTest.kt

@@ -39,8 +39,8 @@ internal class QIdentityManagerTest {
 
             // when
             identityManager.identify(newUserID, object : IdentityManagerCallback {
-                override fun onSuccess(identityID: String) {
-                    resultUserID = identityID
+                override fun onSuccess(qonversionUid: String) {
+                    resultUserID = qonversionUid
                 }
                 override fun onError(error: QonversionError) {}
             })
@@ -62,8 +62,8 @@ internal class QIdentityManagerTest {
 
             // when
             identityManager.identify(newUserID, object : IdentityManagerCallback {
-                override fun onSuccess(identityID: String) {
-                    resultUserID = identityID
+                override fun onSuccess(qonversionUid: String) {
+                    resultUserID = qonversionUid
                 }
                 override fun onError(error: QonversionError) {}
             })
@@ -84,7 +84,7 @@ internal class QIdentityManagerTest {
 
             // when
             identityManager.identify(newUserID, object : IdentityManagerCallback {
-                override fun onSuccess(identityID: String) {}
+                override fun onSuccess(qonversionUid: String) {}
                 override fun onError(error: QonversionError) {}
             })
 
@@ -109,7 +109,7 @@ internal class QIdentityManagerTest {
 
             // when
             identityManager.identify(newUserID, object : IdentityManagerCallback {
-                override fun onSuccess(identityID: String) {}
+                override fun onSuccess(qonversionUid: String) {}
                 override fun onError(error: QonversionError) {}
             })
 
@@ -140,7 +140,7 @@ internal class QIdentityManagerTest {
 
             // when
             identityManager.identify(newUserID, object : IdentityManagerCallback {
-                override fun onSuccess(identityID: String) {}
+                override fun onSuccess(qonversionUid: String) {}
                 override fun onError(error: QonversionError) {
                     qError = error
                 }

settings.gradle

@@ -1 +1,6 @@
-include ':sdk', ':sample'
+plugins {
+    // https://kotlinlang.org/docs/gradle-configure-project.html#set-jdk-version-with-the-task-dsl
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.9.0")
+}
+
+include ':sdk', ':sample'