update compose to 1.5.0, gradle to 8.0.0 and agp to 8.0.0

wakaztahir · wakaztahir · commit e5361445ee1f · 2023-08-30T15:45:45.000+05:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/codeeditor/build.gradle.kts b/codeeditor/build.gradle.kts
@@ -1,5 +1,3 @@
-import java.util.Properties
-
 plugins {
     kotlin("multiplatform")
     id("maven-publish")
@@ -12,12 +10,12 @@ group = "com.wakaztahir"
 version = findProperty("version") as String
 
 kotlin {
-    android {
+    androidTarget {
         publishLibraryVariants("release")
     }
     jvm("desktop") {
         compilations.all {
-            kotlinOptions.jvmTarget = "11"
+            kotlinOptions.jvmTarget = "17"
         }
     }
     js(IR) {
@@ -62,14 +60,15 @@ kotlin {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 34
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 33
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
+    namespace = "com.wakaztahir.codeeditor"
 }
diff --git a/codeeditor/src/androidMain/AndroidManifest.xml b/codeeditor/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="com.wakaztahir.codeeditor"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/demo/android/build.gradle.kts b/demo/android/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
     defaultConfig {
         applicationId = "com.wakaztahir.android"
         minSdk = 21
@@ -19,7 +19,8 @@ android {
         versionName = "1.0.0"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
+    namespace = "com.wakaztahir.android"
 }
diff --git a/demo/android/src/main/AndroidManifest.xml b/demo/android/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="com.wakaztahir.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
             android:allowBackup="false"
             android:supportsRtl="true">
diff --git a/demo/common/build.gradle.kts b/demo/common/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvm("desktop") {
         compilations.all {
-            kotlinOptions.jvmTarget = "11"
+            kotlinOptions.jvmTarget = "17"
         }
     }
     js(IR) {
@@ -46,14 +46,15 @@ kotlin {
 }
 
 android {
-    compileSdk = 31
+    compileSdk = 34
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
         targetSdk = 31
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
+    namespace = "com.wakaztahir.common"
 }
diff --git a/demo/common/src/androidMain/AndroidManifest.xml b/demo/common/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="com.wakaztahir.common"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/demo/desktop/build.gradle.kts b/demo/desktop/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 kotlin {
     jvm {
         compilations.all {
-            kotlinOptions.jvmTarget = "11"
+            kotlinOptions.jvmTarget = "17"
         }
     }
     sourceSets {
diff --git a/gradle.properties b/gradle.properties
@@ -1,11 +1,9 @@
 kotlin.code.style=official
 android.useAndroidX=true
-
-version=3.1.2
-versionCode=2
-kotlin.version=1.8.20
-agp.version=7.3.1
-compose.version=1.4.0
-
+version=3.1.3
+versionCode=3
+kotlin.version=1.9.0
+agp.version=8.0.0
+compose.version=1.5.0
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import java.util.Properties`
`2`		`-`
`3`	`1`	`plugins {`
`4`	`2`	`kotlin("multiplatform")`
`5`	`3`	`id("maven-publish")`
`@@ -12,12 +10,12 @@ group = "com.wakaztahir"`
`12`	`10`	`version = findProperty("version") as String`
`13`	`11`
`14`	`12`	`kotlin {`
`15`		`- android {`
	`13`	`+ androidTarget {`
`16`	`14`	`publishLibraryVariants("release")`
`17`	`15`	`}`
`18`	`16`	`jvm("desktop") {`
`19`	`17`	`compilations.all {`
`20`		`- kotlinOptions.jvmTarget = "11"`
	`18`	`+ kotlinOptions.jvmTarget = "17"`
`21`	`19`	`}`
`22`	`20`	`}`
`23`	`21`	`js(IR) {`
`@@ -62,14 +60,15 @@ kotlin {`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`android {`
`65`		`- compileSdk = 32`
	`63`	`+ compileSdk = 34`
`66`	`64`	`sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")`
`67`	`65`	`defaultConfig {`
`68`	`66`	`minSdk = 21`
`69`		`- targetSdk = 32`
	`67`	`+ targetSdk = 33`
`70`	`68`	`}`
`71`	`69`	`compileOptions {`
`72`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`73`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`70`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`71`	`+ targetCompatibility = JavaVersion.VERSION_17`
`74`	`72`	`}`
	`73`	`+ namespace = "com.wakaztahir.codeeditor"`
`75`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.wakaztahir.codeeditor"/>`
	`2`	`+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ dependencies {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`android {`
`13`		`- compileSdk = 33`
	`13`	`+ compileSdk = 34`
`14`	`14`	`defaultConfig {`
`15`	`15`	`applicationId = "com.wakaztahir.android"`
`16`	`16`	`minSdk = 21`
`@@ -19,7 +19,8 @@ android {`
`19`	`19`	`versionName = "1.0.0"`
`20`	`20`	`}`
`21`	`21`	`compileOptions {`
`22`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`23`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`22`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`23`	`+ targetCompatibility = JavaVersion.VERSION_17`
`24`	`24`	`}`
	`25`	`+ namespace = "com.wakaztahir.android"`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`kotlin {`
`8`		`- android()`
	`8`	`+ androidTarget()`
`9`	`9`	`jvm("desktop") {`
`10`	`10`	`compilations.all {`
`11`		`- kotlinOptions.jvmTarget = "11"`
	`11`	`+ kotlinOptions.jvmTarget = "17"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`js(IR) {`
`@@ -46,14 +46,15 @@ kotlin {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`android {`
`49`		`- compileSdk = 31`
	`49`	`+ compileSdk = 34`
`50`	`50`	`sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")`
`51`	`51`	`defaultConfig {`
`52`	`52`	`minSdk = 21`
`53`	`53`	`targetSdk = 31`
`54`	`54`	`}`
`55`	`55`	`compileOptions {`
`56`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`57`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`56`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`57`	`+ targetCompatibility = JavaVersion.VERSION_17`
`58`	`58`	`}`
	`59`	`+ namespace = "com.wakaztahir.common"`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`kotlin {`
`9`	`9`	`jvm {`
`10`	`10`	`compilations.all {`
`11`		`- kotlinOptions.jvmTarget = "11"`
	`11`	`+ kotlinOptions.jvmTarget = "17"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`sourceSets {`