Examples/templates. Refactoring after migration to 0.3.0

examples/todoapp/android/build.gradle.kts

@@ -37,15 +37,7 @@ dependencies {
     implementation(Deps.ArkIvanov.MVIKotlin.mvikotlinLogging)
     implementation(Deps.ArkIvanov.MVIKotlin.mvikotlinTimeTravel)
     implementation(Deps.ArkIvanov.Decompose.decompose)
-    implementation(Deps.ArkIvanov.Decompose.extensionsCompose) {
+    implementation(Deps.ArkIvanov.Decompose.extensionsCompose)
-        // TODO remove when we will not be using 0.0.0-unmerged version
-        exclude(group = "org.jetbrains.compose.desktop")
-        exclude(group = "org.jetbrains.compose.animation")
-        exclude(group = "org.jetbrains.compose.foundation")
-        exclude(group = "org.jetbrains.compose.material")
-        exclude(group = "org.jetbrains.compose.runtime")
-        exclude(group = "org.jetbrains.compose.ui")
-    }
     implementation(Deps.AndroidX.AppCompat.appCompat)
 
     implementation(Deps.AndroidX.Activity.activityCompose)

examples/todoapp/common/compose-ui/build.gradle.kts

@@ -11,15 +11,7 @@ kotlin {
                 implementation(project(":common:edit"))
                 implementation(project(":common:root"))
                 implementation(Deps.ArkIvanov.Decompose.decompose)
-                implementation(Deps.ArkIvanov.Decompose.extensionsCompose) {
+                implementation(Deps.ArkIvanov.Decompose.extensionsCompose)
-                    // TODO remove when we will not be using 0.0.0-unmerged version
-                    exclude(group = "org.jetbrains.compose.desktop")
-                    exclude(group = "org.jetbrains.compose.animation")
-                    exclude(group = "org.jetbrains.compose.foundation")
-                    exclude(group = "org.jetbrains.compose.material")
-                    exclude(group = "org.jetbrains.compose.runtime")
-                    exclude(group = "org.jetbrains.compose.ui")
-                }
             }
         }
     }

examples/todoapp/desktop/build.gradle.kts

@@ -20,15 +20,7 @@ kotlin {
                 implementation(project(":common:root"))
                 implementation(project(":common:compose-ui"))
                 implementation(Deps.ArkIvanov.Decompose.decompose)
-                implementation(Deps.ArkIvanov.Decompose.extensionsCompose) {
+                implementation(Deps.ArkIvanov.Decompose.extensionsCompose)
-                    // TODO remove when we will not be using 0.0.0-unmerged version
-                    exclude(group = "org.jetbrains.compose.desktop")
-                    exclude(group = "org.jetbrains.compose.animation")
-                    exclude(group = "org.jetbrains.compose.foundation")
-                    exclude(group = "org.jetbrains.compose.material")
-                    exclude(group = "org.jetbrains.compose.runtime")
-                    exclude(group = "org.jetbrains.compose.ui")
-                }
                 implementation(Deps.ArkIvanov.MVIKotlin.mvikotlin)
                 implementation(Deps.ArkIvanov.MVIKotlin.mvikotlinMain)
                 implementation(Deps.Badoo.Reaktive.reaktive)

templates/multiplatform-template/android/build.gradle.kts

@@ -22,4 +22,5 @@ android {
 
 dependencies {
     implementation(project(":common"))
+    implementation("androidx.activity:activity-compose:1.3.0-alpha03")
 }

templates/multiplatform-template/android/src/main/java/com/myapplication/MainActivity.kt

@@ -2,8 +2,8 @@ package com.myapplication
 
 import App
 import android.os.Bundle
+import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.ui.platform.setContent
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {