update kotlin to 1.8.0

Author: wakaztahir

.idea/misc.xml

@@ -24,6 +24,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
 }

build.gradle.kts

@@ -41,11 +41,11 @@ kotlin {
 
             }
         }
-        val androidTest by getting {
-            dependencies {
-                implementation("junit:junit:4.13.2")
-            }
-        }
+//        val androidTest by getting {
+//            dependencies {
+//                implementation("junit:junit:4.13.2")
+//            }
+//        }
         val desktopMain by getting {
             dependencies {
                 api(compose.preview)

codeeditor/build.gradle.kts

@@ -6,25 +6,20 @@ plugins {
 
 dependencies {
     implementation(project(":demo:common"))
-    implementation("androidx.activity:activity-compose:1.4.0")
+    implementation("androidx.activity:activity-compose:1.6.1")
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
     defaultConfig {
         applicationId = "com.wakaztahir.android"
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0.0"
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-        }
-    }
 }

demo/android/build.gradle.kts

@@ -3,7 +3,7 @@ package com.wakaztahir.android
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material3.MaterialTheme
 import com.wakaztahir.common.DisplayCodeEditor
 
 class MainActivity : ComponentActivity() {

demo/android/src/main/java/com/wakaztahir/android/MainActivity.kt

@@ -20,7 +20,8 @@ kotlin {
             dependencies {
                 api(compose.runtime)
                 api(compose.foundation)
-                api(compose.material)
+                @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
+                api(compose.material3)
                 implementation(project(":codeeditor"))
             }
         }
@@ -30,11 +31,11 @@ kotlin {
             }
         }
         val androidMain by getting
-        val androidTest by getting {
-            dependencies {
-                implementation("junit:junit:4.13")
-            }
-        }
+//        val androidTest by getting {
+//            dependencies {
+//                implementation("junit:junit:4.13")
+//            }
+//        }
         val desktopMain by getting {
             dependencies {
                 api(compose.preview)

demo/common/build.gradle.kts

@@ -4,10 +4,10 @@ import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -92,14 +92,14 @@ fun DisplayCodeEditor() {
             }
         }
         if(customLanguage != null){
-            Text(text = "Custom Lang has these keywords : Google , Jetbrains , Compose , Qawaz",color = MaterialTheme.colors.onBackground.copy(.5f))
+            Text(text = "Custom Lang has these keywords : Google , Jetbrains , Compose , Qawaz",color = MaterialTheme.colorScheme.onBackground.copy(.5f))
         }
         Row {
             Box(modifier = Modifier.padding(horizontal = 4.dp)) {
                 repeat(lineCount) { line ->
                     Text(
                         text = (line + 1).toString(),
-                        color = MaterialTheme.colors.onBackground.copy(.3f),
+                        color = MaterialTheme.colorScheme.onBackground.copy(.3f),
                         modifier = Modifier.offset(y = (line * lineHeight).dp)
                     )
                 }

demo/common/src/commonMain/kotlin/com/wakaztahir/common/DisplayCodeEditor.kt

@@ -47,10 +47,10 @@ compose.experimental {
     web.application {}
 }
 
-afterEvaluate {
-    rootProject.extensions.configure<NodeJsRootExtension> {
-        versions.webpackDevServer.version = "4.0.0"
-        versions.webpackCli.version = "4.9.0"
-        nodeVersion = "16.0.0"
-    }
-}
+//afterEvaluate {
+//    rootProject.extensions.configure<NodeJsRootExtension> {
+//        versions.webpackDevServer.version = "4.0.0"
+//        versions.webpackCli.version = "4.9.0"
+//        nodeVersion = "16.0.0"
+//    }
+//}

demo/web/build.gradle.kts

@@ -1,11 +1,11 @@
 kotlin.code.style=official
 android.useAndroidX=true
 
-version=3.1.0
-versionCode=1
-kotlin.version=1.7.20
-agp.version=7.0.4
-compose.version=1.2.1
+version=3.1.1
+versionCode=2
+kotlin.version=1.8.0
+agp.version=7.3.1
+compose.version=1.3.0
 
 org.jetbrains.compose.experimental.jscanvas.enabled=true
-kotlin.js.webpack.major.version=4
+kotlin.mpp.androidSourceSetLayoutVersion=2