release/7.10.1

SourcePointUSA · Aug 27, 2024 · 93194b5 · 93194b5
2 parents 41e1dd2 + 02a26b5
commit 93194b5
Show file tree

Hide file tree

Showing 32 changed files with 216 additions and 303 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.9.24'
+    ext.kotlin_version = '1.9.25'
 
     repositories {
         google()
@@ -27,15 +27,14 @@ plugins {
     id 'io.github.dryrum.replace-in-file' version '0.6.4'
     id 'io.github.dryrum.git-utils' version '0.6.4'
     id 'io.github.dryrum.bump-version-code' version '0.6.4'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.21'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.25'
 }
 
 apply plugin: 'io.codearte.nexus-staging'
 
 allprojects {
     repositories {
         google()
-        jcenter()
         maven { url "https://s01.oss.sonatype.org/service/local/repositories/snapshots/content/" }
         maven { url "https://s01.oss.sonatype.org/content/repositories/releases/"} // repo to test the release
         mavenCentral()

diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
@@ -2,8 +2,8 @@ object Libs {
     const val kotlinxCoroutinesCore: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core:" + Versions.coroutinesVersion
     const val mockk: String = "io.mockk:mockk:" + Versions.mockkVersion
     const val okHttpLatest = "com.squareup.okhttp3:okhttp:${Versions.okHttpLatestVersion}"
-    const val koinCore = "org.koin:koin-core:${Versions.koinVersion}"
-    const val koinCoreExt = "org.koin:koin-core-ext:${Versions.koinVersion}"
+    const val koinCore = "io.insert-koin:koin-core:${Versions.koinVersion}"
+    const val koinCoreExt = "io.insert-koin:koin-core-ext:${Versions.koinVersion}"
     const val koinAndroid = "io.insert-koin:koin-android:2.2.3"
     const val koinViewModel = "io.insert-koin:koin-androidx-viewmodel:2.2.3"
 
@@ -19,5 +19,3 @@ object Libs {
     const val leanback_pref : String = "androidx.leanback:leanback-preference:1.0.0"
 
 }
-
-
diff --git a/cmplibrary/build.gradle.kts b/cmplibrary/build.gradle.kts
@@ -94,15 +94,15 @@ android {
 
 dependencies {
     // kotlin
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
 
     // https://mvnrepository.com/artifact/com.android.tools/desugar_jdk_libs
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.0")
 
     //noinspection GradleDependency
     api("com.squareup.okhttp3:okhttp:4.9.0")
 
-    api("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.3.0")
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.5.1")
 
     testImplementation("io.mockk:mockk:1.12.3")
 }
@@ -150,4 +150,4 @@ changeLogConfig {
     changeLogPath = rootDir.path + "/CHANGELOG.md"
     content = file(  "${rootDir.path}/${project.name}/release_note.txt").readText()
     version = versionName
-}
+}
diff --git a/cmplibrary/gradle.properties b/cmplibrary/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME = 7.10.0
+VERSION_NAME = 7.10.1
 
 POM_NAME = cmplibrary
 POM_REPO = sourcepoint

diff --git a/cmplibrary/release_note.txt b/cmplibrary/release_note.txt
@@ -1 +1,2 @@
-* [DIA-3574](https://sourcepoint.atlassian.net/browse/DIA-3574) Update all dependencies and Kotlin from 1.6 to 1.9.24. [#808](https://github.com/SourcePointUSA/android-cmp-app/pull/808)
+* [DIA-3942](https://sourcepoint.atlassian.net/browse/DIA-3942) Update all dependencies and Kotlin from 1.6 to 1.9.24. [#830](https://github.com/SourcePointUSA/android-cmp-app/pull/830)
+* Updated sample apps dependencies and project Kotlin version to 1.9.25 [#831](https://github.com/SourcePointUSA/android-cmp-app/pull/831)
diff --git a/...ary/src/androidTest/java/com/sourcepoint/cmplibrary/data/local/DataStorageGdprImplTest.kt b/...ary/src/androidTest/java/com/sourcepoint/cmplibrary/data/local/DataStorageGdprImplTest.kt
@@ -83,10 +83,10 @@ class DataStorageGdprImplTest {
             "IABTCF_PurposeConsents": "1111000010",
             "IABTCF_PurposeLegitimateInterests": "0100000000",
             "IABTCF_SpecialFeaturesOptIns": "11",
-            "IABTCF_PublisherConsent": "0000000000",
-            "IABTCF_PublisherLegitimateInterests": "0000000000",
-            "IABTCF_PublisherCustomPurposesConsents": "0000000000",
-            "IABTCF_PublisherCustomPurposesLegitimateInterests": "0000000000",
+            "IABTCF_PublisherConsent": "00000000000",
+            "IABTCF_PublisherLegitimateInterests": "00000000000",
+            "IABTCF_PublisherCustomPurposesConsents": "00000000000",
+            "IABTCF_PublisherCustomPurposesLegitimateInterests": "00000000000",
             "IABTCF_EnableAdvertiserConsentMode": true,
             "IABTCF_gdprApplies": 1,
             "IABTCF_PublisherRestrictions2": "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",

diff --git a/cmplibrary/src/main/java/com/sourcepoint/cmplibrary/model/MessageLanguage.kt b/cmplibrary/src/main/java/com/sourcepoint/cmplibrary/model/MessageLanguage.kt
@@ -15,12 +15,17 @@ enum class MessageLanguage(val value: String) {
     GAELIC("GD"),
     GERMAN("DE"),
     GREEK("EL"),
+    HEBREW("HE"),
     HUNGARIAN("HU"),
     ICELANDIC("IS"),
+    INDONESIAN("ID"),
     ITALIAN("IT"),
     JAPANESE("JA"),
+    KOREAN("KO"),
     LATVIAN("LV"),
     LITHUANIAN("LT"),
+    MACEDONIAN("MK"),
+    MALAY("MS"),
     NORWEGIAN("NO"),
     POLISH("PL"),
     PORTUGUESE("PT"),
@@ -32,6 +37,6 @@ enum class MessageLanguage(val value: String) {
     SLOVENIAN("SL"),
     SPANISH("ES"),
     SWEDISH("SV"),
-    TURKISH("TR"),
-    TAGALOG("TL");
+    TAGALOG("TL"),
+    TURKISH("TR");
 }
diff --git a/cmplibrary/src/test/java/com/sourcepoint/cmplibrary/campaign/CampaignManagerTest.kt b/cmplibrary/src/test/java/com/sourcepoint/cmplibrary/campaign/CampaignManagerTest.kt
@@ -647,10 +647,10 @@ class CampaignManagerTest {
             "IABTCF_PurposeConsents": "1111110000",
             "IABTCF_PurposeLegitimateInterests": "0100000000",
             "IABTCF_SpecialFeaturesOptIns": "00",
-            "IABTCF_PublisherConsent": "0000000000",
-            "IABTCF_PublisherLegitimateInterests": "0000000000",
-            "IABTCF_PublisherCustomPurposesConsents": "0000000000",
-            "IABTCF_PublisherCustomPurposesLegitimateInterests": "0000000000",
+            "IABTCF_PublisherConsent": "00000000000",
+            "IABTCF_PublisherLegitimateInterests": "00000000000",
+            "IABTCF_PublisherCustomPurposesConsents": "00000000000",
+            "IABTCF_PublisherCustomPurposesLegitimateInterests": "00000000000",
             "IABTCF_gdprApplies": 1
           },
           "uuid": "0a9a7b2d-ddb7-467f-9e3e-da53860b5ac4",

diff --git a/samples/app/build.gradle b/samples/app/build.gradle
@@ -63,11 +63,10 @@ android {
 }
 
 dependencies {
-
     implementation fileTree(include: ['*.aar'], dir: 'libs')
 
     // kotlin
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     //noinspection GradleCompatible
@@ -79,11 +78,9 @@ dependencies {
 //    implementation 'com.sourcepoint.cmplibrary:cmplibrary:6.0.3'
 
     // Koin
-    implementation "org.koin:koin-core:2.0.1"
-    implementation "org.koin:koin-core-ext:2.0.1"
-    implementation "org.koin:koin-android:2.0.1"
-    implementation "org.koin:koin-java:2.0.1"
-    androidTestImplementation "org.koin:koin-test:2.0.1"
+    implementation "io.insert-koin:koin-core:3.5.6"
+    implementation "io.insert-koin:koin-android:3.5.6"
+    androidTestImplementation "io.insert-koin:koin-test:3.5.6"
 
     // mockk
     testImplementation("io.mockk:mockk:1.12.3")

diff --git a/samples/app/src/androidTest/java/com/sourcepoint/app/v6/MainActivityKotlinTest.kt b/samples/app/src/androidTest/java/com/sourcepoint/app/v6/MainActivityKotlinTest.kt
@@ -248,7 +248,7 @@ class MainActivityKotlinTest {
                 getInt("IABTCF_gdprApplies", -1).assertNotEquals(-1)
 
                 getString("IABTCF_TCString", null).assertNotNull()
-                getString("IABTCF_PublisherLegitimateInterests", null).assertEquals("0000000000")
+                getString("IABTCF_PublisherLegitimateInterests", null).assertEquals("00000000000")
                 getString("IABTCF_AddtlConsent", null).assertEquals("1~899")
                 getString("IABTCF_PurposeConsents", null).assertNotNull()
                 getString("IABTCF_VendorLegitimateInterests", null).assertNotNull()
@@ -617,7 +617,7 @@ class MainActivityKotlinTest {
         scenario.onActivity {
             getSharedPrefs(it).run {
                 getString("IABTCF_AddtlConsent", null).assertEquals("1~")
-                getString("IABTCF_PublisherLegitimateInterests", null).assertEquals("0000000000")
+                getString("IABTCF_PublisherLegitimateInterests", null).assertEquals("00000000000")
                 getString("IABTCF_TCString", null).assertNotNull()
                 getInt("IABTCF_CmpSdkVersion", -1).assertNotEquals(-1)
                 getInt("IABTCF_CmpSdkID", -1).assertNotEquals(-1)
@@ -1165,4 +1165,4 @@ class MainActivityKotlinTest {
             getSharedPrefs(it).getInt("sp.key.config.propertyId", 0).assertEquals(newPropertyId)
         }
     }
-}
+}
diff --git a/samples/app/src/androidTest/java/com/sourcepoint/app/v6/TestData.kt b/samples/app/src/androidTest/java/com/sourcepoint/app/v6/TestData.kt
diff --git a/samples/app/src/main/java/com/sourcepoint/app/v6/App.kt b/samples/app/src/main/java/com/sourcepoint/app/v6/App.kt
@@ -5,19 +5,15 @@ import com.sourcepoint.app.v6.di.appModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
 
 class App : Application() {
-
     override fun onCreate() {
         super.onCreate()
         startKoin {
-            // Use Koin Android Logger
-            androidLogger()
-            // declare Android context
+            androidLogger(Level.ERROR)
             androidContext(this@App)
-            // declare modules to use
             modules(appModule)
         }
     }
-
-}
+}
diff --git a/samples/app/src/main/java/com/sourcepoint/app/v6/MainActivityKotlin.kt b/samples/app/src/main/java/com/sourcepoint/app/v6/MainActivityKotlin.kt
diff --git a/samples/metaapp/build.gradle.kts b/samples/metaapp/build.gradle.kts
@@ -98,7 +98,7 @@ dependencies {
 
     // kotlin
     implementation(Libs.kotlinxCoroutinesCore)
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.24")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.25")
 
     implementation(project(":cmplibrary"))
 

diff --git a/samples/metaapp/src/main/java/com/sourcepointmeta/metaapp/App.kt b/samples/metaapp/src/main/java/com/sourcepointmeta/metaapp/App.kt
@@ -8,15 +8,11 @@ import org.koin.core.context.startKoin
 import org.koin.core.logger.Level
 
 class App : Application() {
-
     override fun onCreate() {
         super.onCreate()
         startKoin {
-            // Use Koin Android Logger
-            androidLogger(if (BuildConfig.DEBUG) Level.ERROR else Level.NONE)
-            // declare Android context
+            androidLogger(Level.ERROR)
             androidContext(this@App)
-            // declare modules to use
             modules(appModule)
         }
     }

diff --git a/samples/metaapp/src/main/java/com/sourcepointmeta/metaapp/util/DefaultProperties.kt b/samples/metaapp/src/main/java/com/sourcepointmeta/metaapp/util/DefaultProperties.kt
diff --git a/samples/nat-message-demo/build.gradle b/samples/nat-message-demo/build.gradle
@@ -70,11 +70,11 @@ dependencies {
     implementation fileTree(include: ['*.aar'], dir: 'libs')
 
     // kotlin
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     //noinspection GradleCompatible
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.10.0'

diff --git a/samples/ott-message-demo/build.gradle b/samples/ott-message-demo/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
 apply from: rootDir.path + '/gradleutils/test_config.gradle'
 
 android {
-    compileSdk 33
+    compileSdk 34
     namespace "com.sourcepoint.app.v6"
     defaultConfig {
         applicationId "com.sourcepoint.ott.demo"
@@ -70,12 +70,12 @@ dependencies {
     implementation fileTree(include: ['*.aar'], dir: 'libs')
 
     // kotlin
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     //noinspection GradleCompatible
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
 //    implementation 'com.sourcepoint.cmplibrary:cmplibrary:6.4.1'
     implementation project(':cmplibrary')

diff --git a/samples/web-message-demo/build.gradle b/samples/web-message-demo/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
 apply from: rootDir.path + '/gradleutils/test_config.gradle'
 
 android {
-    compileSdk 33
+    compileSdk 34
     namespace "com.sourcepoint.app.v6"
     defaultConfig {
         applicationId "com.sourcepoint.demo"
@@ -70,12 +70,12 @@ dependencies {
     implementation fileTree(include: ['*.aar'], dir: 'libs')
 
     // kotlin
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     //noinspection GradleCompatible
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.10.0'
 }
diff --git a/ui-test-util/build.gradle b/ui-test-util/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
     namespace = "com.example.uitestutil"
     defaultConfig {
         minSdk 21
@@ -24,23 +24,23 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
 
     implementation(Libs.material)
 
-    implementation "androidx.test:runner:1.5.2"
-    androidTestUtil "androidx.test:orchestrator:1.4.2"
-    implementation "androidx.test:rules:1.5.0"
-    implementation "androidx.test.ext:junit-ktx:1.1.5"
-    implementation "androidx.test:core-ktx:1.5.0"
-    implementation "androidx.test.espresso:espresso-contrib:3.5.1"
+    implementation "androidx.test:runner:1.6.2"
+    androidTestUtil "androidx.test:orchestrator:1.5.0"
+    implementation "androidx.test:rules:1.6.1"
+    implementation "androidx.test.ext:junit-ktx:1.2.1"
+    implementation "androidx.test:core-ktx:1.6.1"
+    implementation "androidx.test.espresso:espresso-contrib:3.6.1"
 
     // Set this dependency to build and run Espresso tests espresso web
-    implementation "androidx.test.espresso:espresso-core:3.5.1"
-    implementation "androidx.test.espresso:espresso-web:3.5.1"
+    implementation "androidx.test.espresso:espresso-core:3.6.1"
+    implementation "androidx.test.espresso:espresso-web:3.6.1"
 
     // Activity rules for instrumentation test
-    implementation('androidx.test:rules:1.5.0') {
+    implementation('androidx.test:rules:1.6.1') {
         exclude module: 'support-annotations'
     }
-}
+}