Kotlin + AGP + Gradle + Dependency updates + Cleanup (#365)

touchlab · Sep 20, 2023 · ac06715 · ac06715
1 parent 8e20fa5
commit ac06715
Show file tree

Hide file tree

Showing 63 changed files with 1,023 additions and 1,201 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: "adopt"
-          java-version: "11"
+          java-version: "17"
       - name: Install msys2
         if: matrix.os == 'windows-latest'
         uses: msys2/setup-msys2@v2
@@ -73,4 +73,4 @@ jobs:
         shell: bash
 
 env:
-  GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"
+  GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: "adopt"
-          java-version: "11"
+          java-version: "17"
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Cache gradle
@@ -63,4 +63,4 @@ jobs:
           tag: ${{ steps.version-match.outputs.group1 }}
 
 env:
-  GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"
+  GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,18 +13,17 @@
 
 buildscript {
     extra["kotlin_plugin_id"] = "co.touchlab.kermit"
-    dependencies {
-        classpath("com.vanniktech:gradle-maven-publish-plugin:0.23.1")
-    }
 }
 
 plugins {
-    kotlin("multiplatform") apply false
-    id("com.android.library") version "7.4.2" apply false
-    id("com.github.gmazzo.buildconfig") version "2.1.0" apply false
-    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
-    id("org.jetbrains.dokka") version "1.8.20" apply false
-    id("co.touchlab.touchlabtools.docusaurusosstemplate") version "0.1.10"
+    alias(libs.plugins.maven.publish) apply false
+    alias(libs.plugins.buildConfig) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.binaryCompatability)
+    alias(libs.plugins.dokka) apply false
+    alias(libs.plugins.touchlab.docusaurus.template)
+    alias(libs.plugins.android.library) apply false
+
 }
 apiValidation {
     nonPublicMarkers.add("co.touchlab.kermit.ExperimentalKermitApi")

diff --git a/extensions/kermit-bugsnag/api/kermit-bugsnag.api b/extensions/kermit-bugsnag/api/kermit-bugsnag.api
@@ -1,7 +0,0 @@
-public final class co/touchlab/kermit/bugsnag/BuildConfig {
-	public static final field BUILD_TYPE Ljava/lang/String;
-	public static final field DEBUG Z
-	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
-	public fun <init> ()V
-}
-

diff --git a/extensions/kermit-bugsnag/build.gradle.kts b/extensions/kermit-bugsnag/build.gradle.kts
@@ -14,36 +14,33 @@
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
+    id("com.vanniktech.maven.publish")
 }
 
 apply(from = "../../gradle/configure-crash-logger.gradle")
 kotlin {
+    targetHierarchy.default()
     androidTarget {
         publishAllLibraryVariants()
     }
 
-    val commonMain by sourceSets.getting {
-        dependencies {
-            api(libs.crashkios.bugsnag)
-        }
-    }
-
-    val androidMain by sourceSets.getting {
-        dependencies {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(libs.crashkios.bugsnag)
+            }
         }
     }
 }
 
 android {
     namespace = "co.touchlab.kermit.bugsnag"
-    compileSdk = 30
+    compileSdk = libs.versions.compileSdk.get().toInt()
     defaultConfig {
-        minSdk = 16
+        minSdk = libs.versions.minSdk.get().toInt()
     }
-
-    val main by sourceSets.getting {
-        manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-}
-
-apply(plugin = "com.vanniktech.maven.publish")
+}
diff --git a/extensions/kermit-bugsnag/src/androidMain/AndroidManifest.xml b/extensions/kermit-bugsnag/src/androidMain/AndroidManifest.xml
diff --git a/extensions/kermit-crashlytics/api/kermit-crashlytics.api b/extensions/kermit-crashlytics/api/kermit-crashlytics.api
@@ -1,7 +0,0 @@
-public final class co/touchlab/kermit/crashlytics/BuildConfig {
-	public static final field BUILD_TYPE Ljava/lang/String;
-	public static final field DEBUG Z
-	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
-	public fun <init> ()V
-}
-

diff --git a/extensions/kermit-crashlytics/build.gradle.kts b/extensions/kermit-crashlytics/build.gradle.kts
@@ -14,37 +14,34 @@
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
+    id("com.vanniktech.maven.publish")
 }
 
 apply(from = "../../gradle/configure-crash-logger.gradle")
 
 kotlin {
+    targetHierarchy.default()
     androidTarget {
         publishAllLibraryVariants()
     }
 
-    val commonMain by sourceSets.getting {
-        dependencies {
-            api(libs.crashkios.crashlytics)
-        }
-    }
-
-    val androidMain by sourceSets.getting {
-        dependencies {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(libs.crashkios.crashlytics)
+            }
         }
     }
 }
 
 android {
     namespace = "co.touchlab.kermit.crashlytics"
-    compileSdk = 30
+    compileSdk = libs.versions.compileSdk.get().toInt()
     defaultConfig {
-        minSdk = 16
+        minSdk = libs.versions.minSdk.get().toInt()
     }
-
-    val main by sourceSets.getting {
-        manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-}
-
-apply(plugin = "com.vanniktech.maven.publish")
+}
diff --git a/extensions/kermit-crashlytics/src/androidMain/AndroidManifest.xml b/extensions/kermit-crashlytics/src/androidMain/AndroidManifest.xml
diff --git a/extensions/kermit-koin/api/android/kermit-koin.api b/extensions/kermit-koin/api/android/kermit-koin.api
@@ -1,10 +1,3 @@
-public final class co/touchlab/kermit/koin/BuildConfig {
-	public static final field BUILD_TYPE Ljava/lang/String;
-	public static final field DEBUG Z
-	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
-	public fun <init> ()V
-}
-
 public final class co/touchlab/kermit/koin/GetLoggerWithTagKt {
 	public static final fun kermitLoggerModule (Lco/touchlab/kermit/Logger;)Lorg/koin/core/module/Module;
 }

diff --git a/extensions/kermit-koin/build.gradle.kts b/extensions/kermit-koin/build.gradle.kts
@@ -14,9 +14,11 @@
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
+    id("com.vanniktech.maven.publish")
 }
 
 kotlin {
+    targetHierarchy.default()
     androidTarget {
         publishAllLibraryVariants()
     }
@@ -31,7 +33,6 @@ kotlin {
     iosX64()
     iosArm64()
     iosSimulatorArm64()
-    watchosArm32()
     watchosArm64()
     watchosSimulatorArm64()
     watchosX64()
@@ -40,17 +41,17 @@ kotlin {
     tvosX64()
 
     linuxX64()
-
     mingwX64()
 
-    // TODO: These targets aren't supported by Koin yet:
+    // TODO: These targets aren't supported by Koin yet or stopped the support:
+    //    watchosArm32()
     // androidNativeArm32()
     // androidNativeArm64()
     // androidNativeX86()
     // androidNativeX64()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":kermit"))
                 implementation(libs.koin)
@@ -61,14 +62,12 @@ kotlin {
 
 android {
     namespace = "co.touchlab.kermit.koin"
-    compileSdk = 30
+    compileSdk = libs.versions.compileSdk.get().toInt()
     defaultConfig {
-        minSdk = 16
+        minSdk = libs.versions.minSdk.get().toInt()
     }
-
-    val main by sourceSets.getting {
-        manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-}
-
-apply(plugin = "com.vanniktech.maven.publish")
+}
diff --git a/extensions/kermit-koin/src/androidMain/AndroidManifest.xml b/extensions/kermit-koin/src/androidMain/AndroidManifest.xml
diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,11 @@
 kotlin.code.style=official
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2g
+org.gradle.jvmargs=-Xmx4g
 
 SONATYPE_HOST=DEFAULT
 RELEASE_SIGNING_ENABLED=true
 GROUP=co.touchlab
 VERSION_NAME=2.0.0-RC5
-KOTLIN_VERSION=1.9.0
 
 POM_NAME=Kermit
 POM_DESCRIPTION=Kermit The Log