Merge pull request #118 from ahna92/kotlin_1.9.21_wasm

[CHORE] Kotlin 1.9.21

.github/workflows/pull_request.yml

@@ -18,7 +18,7 @@ jobs:
       - name: "Setup Java"
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Run common tests
         run: ./gradlew :napier:test --stacktrace
@@ -42,6 +42,8 @@ jobs:
         run: ./gradlew :napier:tvosX64Test --stacktrace
       - name: Run tvos(apple silicon) tests
         run: ./gradlew :napier:tvosSimulatorArm64Test --stacktrace
+      - name: Run wasmJs tests
+        run: ./gradlew :napier:wasmJsTest --stacktrace
 
       - name: Bundle the build report
         if: failure()

android/build.gradle.kts

@@ -14,10 +14,11 @@ android {
     buildToolsVersion(Versions.buildToolsVersion)
 
     defaultConfig {
+        namespace = "io.github.aakira.napier.sample"
         minSdkVersion(Versions.minSdkVersion)
         targetSdkVersion(Versions.targetSdkVersion)
-        versionCode(Versions.androidVersionCode)
-        versionName(Versions.androidVersionName)
+        versionCode = Versions.androidVersionCode
+        versionName = Versions.androidVersionName
     }
 
     buildTypes {
@@ -36,11 +37,12 @@ android {
 
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
 
     compileOptions {
-        sourceCompatibility(JavaVersion.VERSION_1_8)
-        targetCompatibility(JavaVersion.VERSION_1_8)
+        sourceCompatibility(JavaVersion.VERSION_17)
+        targetCompatibility(JavaVersion.VERSION_17)
     }
 }
 

android/src/main/AndroidManifest.xml

@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="io.github.aakira.napier.sample">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
-            android:allowBackup="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
-            android:roundIcon="@mipmap/ic_launcher_round"
-            android:supportsRtl="true"
-            android:theme="@style/AppTheme"
-            android:name="io.github.aakira.napier.sample.NapierApp"
-            tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="io.github.aakira.napier.sample.MainActivity">
+        android:name="io.github.aakira.napier.sample.NapierApp"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity
+            android:name="io.github.aakira.napier.sample.MainActivity"
+            android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>

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

@@ -2,12 +2,12 @@ package dependencies
 
 object Dep {
 
-    private const val kotlin = "1.6.21"
+    private const val kotlin = "1.9.21"
 
     object GradlePlugin {
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Dep.kotlin}"
 
-        const val android = "com.android.tools.build:gradle:4.2.1"
+        const val android = "com.android.tools.build:gradle:8.2.0"
 
         const val crashlytics = "com.google.firebase:firebase-crashlytics-gradle:2.5.2"
         const val googleService = "com.google.gms:google-services:4.3.5"
@@ -20,7 +20,7 @@ object Dep {
     }
 
     object Coroutines {
-        private const val version = "1.6.0-native-mt"
+        private const val version = "1.8.0-RC2"
 
         const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
     }

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

@@ -2,13 +2,13 @@ package dependencies
 
 object Versions {
     const val versionCode = 25
-    const val versionName = "2.6.1"
+    const val versionName = "2.7.0"
 
     // android
     const val androidVersionCode = 1
     const val androidVersionName = "1.0.0"
-    const val compileSdkVersion = 30
+    const val compileSdkVersion = 34
     const val buildToolsVersion = "29.0.3"
     const val minSdkVersion = 16
-    const val targetSdkVersion = 28
+    const val targetSdkVersion = 34
 }

gradle.properties

@@ -3,9 +3,6 @@ org.gradle.jvmargs=-Xms2048M -Xmx5120M -XX:MaxPermSize=2048M
 kotlin.code.style=official
 
 kotlin.native.distribution.type=prebuilt
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 # Android
 android.useAndroidX=true

gradle/publish.gradle.kts

@@ -68,6 +68,12 @@ publishing {
         }
     }
 
+    // FIXME - workaround for https://github.com/gradle/gradle/issues/26091
+    val signingTasks = tasks.withType<Sign>()
+    tasks.withType<AbstractPublishToMaven>().configureEach {
+        mustRunAfter(signingTasks)
+    }
+
     repositories {
         maven {
             name = "Sonatype"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Mar 04 17:14:14 JST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip