chore: upgrade kotlin to 1.9.10 and all downstream dependencies neces…

…sary for it to work
Liftric · Oct 23, 2023 · d3a3516 · d3a3516
1 parent d2a4f23
commit d3a3516
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 30 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,16 +1,17 @@
+import com.android.build.gradle.LibraryExtension
 import com.liftric.vault.GetVaultSecretTask
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon
 
 plugins {
-    id("com.android.library") version libs.versions.android.tools.gradle
     kotlin("multiplatform") version libs.versions.kotlin
+    alias(libs.plugins.kotlin.serialization)
+    id("com.android.library") version libs.versions.android.tools.gradle
     alias(libs.plugins.definitions)
     alias(libs.plugins.npm.publishing)
     alias(libs.plugins.versioning)
     alias(libs.plugins.vault.client)
-    alias(libs.plugins.kotlin.serialization)
     id("maven-publish")
     id("signing")
 }
@@ -33,11 +34,12 @@ kotlin {
 
     iosSimulatorArm64()
 
-    android {
-        publishLibraryVariants("debug", "release")
+    androidTarget() {
+        publishAllLibraryVariants()
     }
     jvm()
     js(IR) {
+        generateTypeScriptDefinitions()
         browser {
             testTask {
                 useMocha {
@@ -51,9 +53,9 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(libs.ktor.client.core)
-                implementation(libs.kotlinx.coroutines)
-                implementation(libs.kotlinx.serialization)
+                api(libs.ktor.client.core)
+                api(libs.kotlinx.coroutines)
+                api(libs.kotlinx.serialization)
             }
         }
         val commonTest by getting {
@@ -66,15 +68,15 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                implementation(libs.ktor.client.android)
+                api(libs.ktor.client.android)
             }
         }
         val jvmMain by getting {
             dependencies {
-                implementation(libs.ktor.client.jvm)
+                api(libs.ktor.client.jvm)
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependencies {
                 implementation(libs.roboelectric)
                 implementation(kotlin("test"))
@@ -92,7 +94,7 @@ kotlin {
         }
         val iosMain by getting {
             dependencies {
-                implementation(libs.ktor.client.darwin)
+                api(libs.ktor.client.darwin)
             }
         }
         val iosTest by getting
@@ -104,7 +106,7 @@ kotlin {
         }
         val jsMain by getting {
             dependencies {
-                implementation(libs.ktor.client.js)
+                api(libs.ktor.client.js)
             }
         }
         val jsTest by getting {
@@ -122,13 +124,12 @@ kotlin {
     }
 }
 
-android {
-    compileSdk = 30
-
-    defaultConfig {
-        minSdk = 21
-        targetSdk = 30
-        testInstrumentationRunner = "androidx.test.runner"
+configure<LibraryExtension> {
+    defaultConfig.apply {
+        compileSdk = 30
+        minSdkVersion(21)
+        targetSdkVersion(30)
+        testInstrumentationRunner = "org.robolectric.RobolectricTestRunner"
     }
 
     compileOptions {
@@ -138,9 +139,12 @@ android {
 
     testOptions {
         unitTests.apply {
+            isIncludeAndroidResources = true
             isReturnDefaultValues = true
         }
     }
+
+    namespace = "com.liftric.cognito.idp"
 }
 
 group = "com.liftric"
@@ -352,3 +356,9 @@ vault {
         vaultToken.set(System.getenv("VAULT_TOKEN"))
     }
 }
+afterEvaluate {
+    tasks.getByName("compileTestKotlinJs").dependsOn("createJsEnvHack")
+    tasks.getByName("compileDebugUnitTestKotlinAndroid").dependsOn("createJsEnvHack")
+    tasks.getByName("compileTestKotlinJvm").dependsOn("createJsEnvHack")
+    tasks.getByName("compileReleaseUnitTestKotlinAndroid").dependsOn("createJsEnvHack")
+}
diff --git a/gradle.properties b/gradle.properties
@@ -2,9 +2,9 @@ android.useAndroidX=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096m
 org.gradle.vfs.watch=true
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.mpp.enableCompatibilityMetadataVariant=true
+#kotlin.native.enableDependencyPropagation=false
+#kotlin.mpp.enableGranularSourceSetsMetadata=true
+#kotlin.mpp.enableCompatibilityMetadataVariant=true
 kotlin.incremental=true
 kotlin.incremental.multiplatform=true
 kotlin.caching.enabled=true

diff --git 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.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,19 +16,19 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("libs") {
-            version("android-tools-gradle", "7.2.0")
-            version("kotlin", "1.7.10")
-            version("ktor", "2.1.3")
+            version("android-tools-gradle", "8.1.0")
+            version("kotlin", "1.9.10")
+            version("ktor", "2.3.3")
 
             library("ktor-client-core", "io.ktor", "ktor-client-core").versionRef("ktor")
             library("ktor-client-android", "io.ktor", "ktor-client-android").versionRef("ktor")
             library("ktor-client-darwin", "io.ktor", "ktor-client-darwin-legacy").versionRef("ktor")
             library("ktor-client-jvm", "io.ktor", "ktor-client-java").versionRef("ktor")
             library("ktor-client-js", "io.ktor", "ktor-client-js").versionRef("ktor")
-            library("kotlinx-coroutines", "org.jetbrains.kotlinx", "kotlinx-coroutines-core").version("1.6.1")
-            library("kotlinx-serialization", "org.jetbrains.kotlinx", "kotlinx-serialization-json").version("1.3.3")
+            library("kotlinx-coroutines", "org.jetbrains.kotlinx", "kotlinx-coroutines-core").version("1.7.3")
+            library("kotlinx-serialization", "org.jetbrains.kotlinx", "kotlinx-serialization-json").version("1.6.0")
             library("androidx-test-core", "androidx.test", "core").version("1.2.0")
-            library("roboelectric", "org.robolectric", "robolectric").version("4.5.1")
+            library("roboelectric", "org.robolectric", "robolectric").version("4.9")
             library("opt-java", "com.github.bastiaanjansen", "otp-java").version("1.3.2")
 
             plugin("vault-client", "com.liftric.vault-client-plugin").version("2.0.0")

diff --git a/src/androidMain/AndroidManifest.xml b/src/androidMain/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest />
diff --git a/...ognito/idp/IdentityProviderClientTests.kt → ...ognito/idp/IdentityProviderClientTests.kt b/...ognito/idp/IdentityProviderClientTests.kt → ...ognito/idp/IdentityProviderClientTests.kt
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml