Merge pull request #119 from AAkira/fix-napier-tests

Fix napier tests.

Author: AAkira

android/build.gradle.kts

@@ -10,13 +10,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion(Versions.compileSdkVersion)
-    buildToolsVersion(Versions.buildToolsVersion)
+    compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig {
         namespace = "io.github.aakira.napier.sample"
-        minSdkVersion(Versions.minSdkVersion)
-        targetSdkVersion(Versions.targetSdkVersion)
+        minSdk = Versions.minSdkVersion
+        targetSdk = Versions.targetSdkVersion
         versionCode = Versions.androidVersionCode
         versionName = Versions.androidVersionName
     }

buildSrc/src/main/kotlin/dependencies/Versions.kt

@@ -8,7 +8,7 @@ object Versions {
     const val androidVersionCode = 1
     const val androidVersionName = "1.0.0"
     const val compileSdkVersion = 34
-    const val buildToolsVersion = "29.0.3"
+    const val buildToolsVersion = "34.0.0"
     const val minSdkVersion = 16
     const val targetSdkVersion = 34
 }

gradle.properties

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xms2048M -Xmx5120M -XX:MaxPermSize=2048M
+org.gradle.jvmargs=-Xms2048M -Xmx5120M 
 
 kotlin.code.style=official
 

mpp-sample/build.gradle.kts

@@ -15,7 +15,7 @@ version = "1.0.0"
 yarn.lockFileDirectory = file("kotlin-js-store")
 
 kotlin {
-    android()
+    androidTarget()
     js {
         browser()
     }
@@ -25,8 +25,8 @@ kotlin {
     if (ideaActive.not()) {
         // intel
         macosX64()
-        ios()
-        watchos()
+        iosX64()
+        watchosX64()
 
         // apple silicon
         macosArm64()
@@ -86,10 +86,10 @@ kotlin {
             val macosX64Main by getting {
                 dependsOn(darwinMain)
             }
-            val iosMain by getting {
+            val iosX64Main by getting {
                 dependsOn(darwinMain)
             }
-            val watchosMain by getting {
+            val watchosX64Main by getting {
                 dependsOn(darwinMain)
             }
 
@@ -137,15 +137,16 @@ kotlin {
 }
 
 android {
-    compileSdkVersion(Versions.compileSdkVersion)
-    buildToolsVersion(Versions.buildToolsVersion)
+    compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = Versions.buildToolsVersion
 
     defaultConfig {
         namespace = "io.github.aakira.napier.mppsample"
-        minSdkVersion(Versions.minSdkVersion)
-        targetSdkVersion(Versions.targetSdkVersion)
-//        versionCode(Versions.androidVersionCode)
-//        versionName(Versions.androidVersionName)
+        minSdk = Versions.minSdkVersion
+    }
+
+    lint {
+        targetSdk = Versions.targetSdkVersion
     }
 
     sourceSets {

mpp-sample/kotlin-js-store/yarn.lock

@@ -10,7 +10,7 @@ plugins {
 apply(from = rootProject.file("./gradle/publish.gradle.kts"))
 
 kotlin {
-    android {
+    androidTarget {
         publishAllLibraryVariants()
     }
     js(IR) {
@@ -25,9 +25,9 @@ kotlin {
     if (ideaActive.not()) {
         // intel
         macosX64()
-        ios()
-        watchos()
-        tvos()
+        iosX64()
+        watchosX64()
+        tvosX64()
 
         // apple silicon
         macosArm64()
@@ -60,7 +60,6 @@ kotlin {
             dependencies {
                 implementation(Dep.Test.common)
                 implementation(Dep.Test.annotation)
-                implementation(Dep.Coroutines.core)
             }
         }
         val androidMain by getting {
@@ -83,24 +82,15 @@ kotlin {
                 implementation(Dep.Test.js)
             }
         }
-        val wasmJsMain by getting {
-            dependencies {
-                implementation(Dep.Kotlin.js)
-            }
-        }
-        val wasmJsTest by getting {
-            dependencies {
-                implementation(Dep.Test.js)
-            }
-        }
+        val wasmJsMain by getting
+        val wasmJsTest by getting
         val jvmMain by getting {
             dependencies {
                 implementation(Dep.Kotlin.jvm)
             }
         }
         val jvmTest by getting {
             dependencies {
-                implementation(Dep.Coroutines.core)
                 implementation(Dep.Test.jvm)
             }
         }
@@ -121,22 +111,22 @@ kotlin {
             val macosX64Test by getting {
                 dependsOn(darwinTest)
             }
-            val iosMain by getting {
+            val iosX64Main by getting {
                 dependsOn(darwinMain)
             }
-            val iosTest by getting {
+            val iosX64Test by getting {
                 dependsOn(darwinTest)
             }
-            val watchosMain by getting {
+            val watchosX64Main by getting {
                 dependsOn(darwinMain)
             }
-            val watchosTest by getting {
+            val watchosX64Test by getting {
                 dependsOn(darwinTest)
             }
-            val tvosMain by getting {
+            val tvosX64Main by getting {
                 dependsOn(darwinMain)
             }
-            val tvosTest by getting {
+            val tvosX64Test by getting {
                 dependsOn(darwinTest)
             }