Merge pull request #11 from joreilly/dependecy_updates

dependency updates

.github/workflows/android.yml

@@ -9,10 +9,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: set up JDK 11
-      uses: actions/setup-java@v1
+    - name: set up JDK 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 11
+        distribution: 'zulu'
+        java-version: 17
     - name: Build Android client
       run: ./gradlew assembleDebug
     - name: Build Compose Desktop client

androidApp/build.gradle.kts

@@ -4,9 +4,11 @@ plugins {
 }
 
 android {
+    namespace = "dev.johnoreilly.wordmaster.androidApp"
+
     compileSdk = AndroidSdk.compile
     defaultConfig {
-        applicationId = "dev.johnoreilly.wordle.androidApp"
+        //applicationId = "dev.johnoreilly.wordle.androidApp"
         minSdk = AndroidSdk.min
         targetSdk = AndroidSdk.target
 
@@ -31,12 +33,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 

androidApp/src/main/AndroidManifest.xml

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

build.gradle.kts

@@ -3,12 +3,13 @@ buildscript {
         gradlePluginPortal()
         google()
         mavenCentral()
+        maven(url = "https://androidx.dev/storage/compose-compiler/repository")
     }
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinVersion}")
-        classpath("com.android.tools.build:gradle:7.4.0")
-        classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.8.0-1.0.8")
+        classpath("com.android.tools.build:gradle:8.2.0")
+        classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.0.0-Beta1-1.0.15")
         classpath("com.rickclephas.kmp:kmp-nativecoroutines-gradle-plugin:${Versions.kmpNativeCoroutines}")
     }
 }
@@ -18,5 +19,6 @@ allprojects {
         google()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven")
+        maven(url = "https://androidx.dev/storage/compose-compiler/repository")
     }
-}
+}

buildSrc/src/main/java/Dependencies.kt

@@ -1,24 +1,24 @@
 
 object Versions {
-    const val kotlinVersion = "1.8.0"
-    const val kotlinCoroutines = "1.6.4"
+    const val kotlinVersion = "2.0.0-Beta1"
+    const val kotlinCoroutines = "1.7.3"
 
-    const val compose = "1.4.0-alpha03"
-    const val composeCompiler = "1.4.0"
-    const val composeDesktopWeb = "1.3.0-rc05"
+    const val compose = "1.5.4"
+    const val composeCompiler = "1.5.5-dev-k2.0.0-Beta1-06b8ae672a4"
+    const val composeDesktopWeb = "1.6.0-alpha01"
     const val navCompose = "2.5.2"
     const val accompanist = "0.26.2-beta"
     const val okio = "3.0.0"
 
-    const val kmpNativeCoroutines = "1.0.0-ALPHA-4"
+    const val kmpNativeCoroutines = "1.0.0-ALPHA-18"
 
     const val junit = "4.13"
 }
 
 
 object AndroidSdk {
     const val min = 24
-    const val compile = 33
+    const val compile = 34
     const val target = compile
 }
 

compose-desktop/build.gradle.kts

@@ -20,10 +20,15 @@ dependencies {
     implementation(project(":shared"))
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-}
+//tasks.withType<KotlinCompile> {
+//    kotlinOptions.jvmTarget = "1.8"
+//}
 
 application {
     mainClass.set("MainKt")
-}
+}
+
+compose {
+    kotlinCompilerPlugin.set("1.5.4-dev1-kt2.0.0-Beta1")
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=2.0.0-Beta1")
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Jan 21 13:46:25 GMT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */

shared/build.gradle.kts

@@ -16,10 +16,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(Kotlinx.coroutinesCore) {
-                    isForce = true
-                }
-
+                api(Kotlinx.coroutinesCore)
                 implementation(Square.okio)
             }
         }
@@ -68,12 +65,18 @@ kotlin {
 }
 
 android {
+    namespace = "dev.johnoreilly.wordmaster.shared"
+
     compileSdk = AndroidSdk.compile
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = AndroidSdk.min
         targetSdk = AndroidSdk.target
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 kotlin.sourceSets.all {

shared/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="dev.johnoreilly.wordmaster.shared"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />