From f606ed50ca2c658b604194b7d82bbb9667585eb9 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Thu, 25 Feb 2021 14:36:37 +0300 Subject: [PATCH] Examples/templates. Refactoring after migration to 0.3.0 --- examples/todoapp/android/build.gradle.kts | 10 +--------- examples/todoapp/common/compose-ui/build.gradle.kts | 10 +--------- examples/todoapp/desktop/build.gradle.kts | 10 +--------- .../multiplatform-template/android/build.gradle.kts | 1 + .../src/main/java/com/myapplication/MainActivity.kt | 2 +- 5 files changed, 5 insertions(+), 28 deletions(-) diff --git a/examples/todoapp/android/build.gradle.kts b/examples/todoapp/android/build.gradle.kts index 9e84b15b47..d1f74184a4 100755 --- a/examples/todoapp/android/build.gradle.kts +++ b/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) { - // 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.Decompose.extensionsCompose) implementation(Deps.AndroidX.AppCompat.appCompat) implementation(Deps.AndroidX.Activity.activityCompose) diff --git a/examples/todoapp/common/compose-ui/build.gradle.kts b/examples/todoapp/common/compose-ui/build.gradle.kts index 27aa0790c0..1975637256 100755 --- a/examples/todoapp/common/compose-ui/build.gradle.kts +++ b/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) { - // 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.Decompose.extensionsCompose) } } } diff --git a/examples/todoapp/desktop/build.gradle.kts b/examples/todoapp/desktop/build.gradle.kts index 68cd17e6e4..6fcccab190 100755 --- a/examples/todoapp/desktop/build.gradle.kts +++ b/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) { - // 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.Decompose.extensionsCompose) implementation(Deps.ArkIvanov.MVIKotlin.mvikotlin) implementation(Deps.ArkIvanov.MVIKotlin.mvikotlinMain) implementation(Deps.Badoo.Reaktive.reaktive) diff --git a/templates/multiplatform-template/android/build.gradle.kts b/templates/multiplatform-template/android/build.gradle.kts index f0a7bb5417..a0a284cc06 100644 --- a/templates/multiplatform-template/android/build.gradle.kts +++ b/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") } \ No newline at end of file diff --git a/templates/multiplatform-template/android/src/main/java/com/myapplication/MainActivity.kt b/templates/multiplatform-template/android/src/main/java/com/myapplication/MainActivity.kt index d6219c1108..52cb3575e1 100644 --- a/templates/multiplatform-template/android/src/main/java/com/myapplication/MainActivity.kt +++ b/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?) {