Merge pull request #37 from joreilly/kotlin_1_9_beta

Kotlin 1.9.0-Beta + related dependencies

Author: joreilly

SharedCode/build.gradle.kts

@@ -30,6 +30,7 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+    namespace = "com.surrus.galwaybus.lib"
 }
 
 
@@ -43,7 +44,7 @@ kotlin {
         iosTarget("iOS") {}
 
         macosX64("macOS")
-        android()
+        androidTarget()
         jvm()
     }
 
@@ -121,6 +122,7 @@ kotlin {
         }
 
     }
+
 }
 
 

SharedCode/src/androidMain/AndroidManifest.xml

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.surrus.galwaybus.lib" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

android-app/build.gradle.kts

@@ -52,11 +52,11 @@ android {
         }
 
         create("release") {
-            storeFile = file("/Users/johnoreilly/dev/keystore/galwaybus_android.jks")
+            storeFile = file("/Users/joreilly/dev/keystore/galwaybus_android.jks")
             keyAlias = keystoreProperties["keyAlias"] as String?
             keyPassword = keystoreProperties["keyPassword"] as String?
             storePassword = keystoreProperties["storePassword"] as String?
-            isV2SigningEnabled = true
+            enableV2Signing = true
         }
     }
 
@@ -112,6 +112,8 @@ android {
             excludes += setOf("META-INF/*.kotlin_module")
         }
     }
+
+    namespace = "dev.johnoreilly.galwaybus"
 }
 
 tasks.withType<KotlinCompile> {

android-app/proguard-rules.pro

@@ -76,4 +76,4 @@
 -dontwarn kotlin.**
 -dontwarn org.jetbrains.annotations.NotNull
 
-
+-dontwarn org.slf4j.impl.StaticLoggerBinder

android-app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.johnoreilly.galwaybus">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 
     <uses-permission android:name="android.permission.INTERNET" />

build.gradle.kts

@@ -7,12 +7,12 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("com.android.tools.build:gradle:8.0.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
         classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}")
         classpath("com.squareup.sqldelight:gradle-plugin:${Versions.sqlDelight}")
         classpath("com.google.gms:google-services:4.3.15")
-        classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.8.20-1.0.10")
+        classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${Versions.kspPlugin}")
         classpath("com.rickclephas.kmp:kmp-nativecoroutines-gradle-plugin:${Versions.kmpNativeCoroutines}")
     }
 }

buildSrc/src/main/java/Dependencies.kt

@@ -1,22 +1,23 @@
 
 object Versions {
-    const val kotlin = "1.8.20"
-    const val kotlinCoroutines = "1.6.4"
-    const val kotlinxSerialization = "1.4.1"
-    const val ktor = "2.2.4"
+    const val kotlin = "1.9.0-Beta"
+    const val kspPlugin = "1.9.0-Beta-1.0.11"
+    const val kotlinCoroutines = "1.7.1"
+    const val kotlinxSerialization = "1.5.1"
+    const val ktor = "2.3.0"
     const val koinCore = "3.4.0"
     const val koinAndroid = "3.4.0"
-    const val koinAndroidCompose = "3.4.3"
+    const val koinAndroidCompose = "3.4.4"
 
     const val sqlDelight = "1.5.5"
     const val kotlinxDateTime = "0.4.0"
     const val multiplatformSettings = "1.0.0"
 
-    const val kmpNativeCoroutines = "1.0.0-ALPHA-4"
+    const val kmpNativeCoroutines = "1.0.0-ALPHA-10-kotlin-1.9.0-Beta"
 
-    const val compose = "1.4.0"
-    const val composeCompiler = "1.4.5"
-    const val navCompose = "2.5.2"
+    const val compose = "1.4.3"
+    const val composeCompiler = "1.4.7-dev-k1.9.0-Beta-bb7dc8b44eb"
+    const val navCompose = "2.5.3"
     const val accompanist = "0.29.0-alpha"
     const val mapsCompose = "2.11.0"
     const val composeMaterial3 = "1.0.0"

fastlane/Fastfile

@@ -17,7 +17,7 @@ default_platform :android
 
 platform :android do
 
-    versionNum = 82
+    versionNum = 83
 
 
     before_all do

gradle.properties

@@ -17,7 +17,5 @@ org.gradle.caching=true
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-android.enableD8=true
-android.enableD8.desugaring=true
 android.useAndroidX=true
 android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat May 21 11:44:03 IST 2022
+#Sun May 28 21:12:18 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+zipStorePath=wrapper/dists