Revert "Prepare for user project"

This reverts commit 110b523.

Author: ilgonmic

build.gradle.kts

@@ -4,6 +4,5 @@ plugins {
     alias(libs.plugins.jetbrainsCompose) apply false
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
-    kotlin("multiplatform") apply false
-    kotlin("plugin.compose") apply false
+    alias(libs.plugins.kotlinMultiplatform) apply false
 }

composeApp/build.gradle.kts

@@ -1,15 +1,12 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.compose.ExperimentalComposeLibrary
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
-    kotlin("multiplatform")
+    alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
-    kotlin("plugin.compose")
 }
 
 kotlin {

composeApp/src/commonMain/kotlin/App.kt

@@ -12,8 +12,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import compose_example.composeapp.generated.resources.Res
-import compose_example.composeapp.generated.resources.compose_multiplatform
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
 
@@ -32,7 +30,7 @@ fun App() {
             }
             AnimatedVisibility(showImage) {
                 Image(
-                    painterResource(Res.drawable.compose_multiplatform),
+                    painterResource("compose-multiplatform.xml"),
                     null
                 )
             }

composeApp/src/commonMain/composeResources/drawable/compose-multiplatform.xml composeApp/src/commonMain/resources/compose-multiplatform.xml

@@ -16,6 +16,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.enableCInteropCommonization=true
 
 #Development
-development=true
-
-kotlin_version=2.0.0-RC3
+development=true

gradle.properties

@@ -1,6 +1,7 @@
 [versions]
 compose = "1.5.4"
-compose-plugin = "1.6.10-rc03"
+compose-plugin = "1.6.0-alpha01"
+compose-compiler = "1.5.4"
 agp = "8.1.4"
 android-minSdk = "24"
 android-compileSdk = "34"
@@ -12,9 +13,12 @@ androidx-material = "1.10.0"
 androidx-constraintlayout = "2.1.4"
 androidx-test-junit = "1.1.5"
 androidx-espresso-core = "3.5.1"
+kotlin = "1.9.21"
 junit = "4.13.2"
 
 [libraries]
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
@@ -32,4 +36,5 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
 [plugins]
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
 androidApplication = { id = "com.android.application", version.ref = "agp" }
-androidLibrary = { id = "com.android.library", version.ref = "agp" }
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

gradle/libs.versions.toml

@@ -2,31 +2,17 @@ rootProject.name = "compose-example"
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
-    val kotlin_repo_url: String? by settings
-    val kotlin_version: String? by settings
-
     repositories {
         google()
         gradlePluginPortal()
         mavenCentral()
-
-        kotlin_repo_url?.also { maven(it) }
-    }
-
-    plugins {
-        kotlin("multiplatform") version kotlin_version
-        kotlin("plugin.compose") version kotlin_version
     }
 }
 
 dependencyResolutionManagement {
-    val kotlin_repo_url: String? by settings
-
     repositories {
         google()
         mavenCentral()
-
-        kotlin_repo_url?.also { maven(it) }
     }
 }