From e34f9c93dafecade4737eeb6c10bf94e11abd918 Mon Sep 17 00:00:00 2001 From: Sebastian Aigner Date: Mon, 20 Feb 2023 09:00:19 +0100 Subject: [PATCH] Move examples to V2 Source Set Layout (#2765) --- .../src/{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/kotlin/MainActivity.kt | 0 .../{main => androidMain}/res/values/strings.xml | 0 experimental/examples/chat-mpp/gradle.properties | 3 +-- .../examples/chat-mpp/shared/build.gradle.kts | 2 +- .../src/{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/assets/data/EditorView.kt | 0 .../org/jetbrains/codeviewer/MainActivity.kt | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../res/values/ic_launcher_background.xml | 0 .../{main => androidMain}/res/values/strings.xml | 0 experimental/examples/codeviewer/gradle.properties | 3 +-- .../src/{main => androidMain}/AndroidManifest.xml | 0 .../org/jetbrains/fallingballs/MainActivity.kt | 0 .../{main => androidMain}/res/values/strings.xml | 0 .../examples/falling-balls-mpp/gradle.properties | 3 +-- .../falling-balls-mpp/shared/build.gradle.kts | 2 +- .../src/{main => androidMain}/AndroidManifest.xml | 0 .../kotlin}/example/imageviewer/MainActivity.kt | 0 experimental/examples/imageviewer/gradle.properties | 3 +-- .../src/{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/kotlin/MainActivity.kt | 0 .../{main => androidMain}/res/values/strings.xml | 0 experimental/examples/minesweeper/gradle.properties | 3 +-- .../examples/minesweeper/shared/build.gradle.kts | 2 +- .../src/{main => androidMain}/AndroidManifest.xml | 0 .../kotlin}/example/todoapp/lite/MainActivity.kt | 0 .../examples/todoapp-lite/gradle.properties | 3 +-- .../src/{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/kotlin/MainActivity.kt | 0 .../{main => androidMain}/res/values/strings.xml | 0 .../examples/visual-effects/gradle.properties | 3 +-- .../src/{main => androidMain}/AndroidManifest.xml | 0 .../jetbrains/compose/demo/widgets/MainActivity.kt | 0 .../res/drawable-v24/ic_launcher_background.xml | 0 .../res/drawable-v24/ic_launcher_foreground.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../res/values-night/themes.xml | 0 .../src/{main => androidMain}/res/values/colors.xml | 0 .../{main => androidMain}/res/values/strings.xml | 0 .../src/{main => androidMain}/res/values/themes.xml | 0 .../examples/widgets-gallery/gradle.properties | 3 +-- 55 files changed, 11 insertions(+), 19 deletions(-) rename experimental/examples/chat-mpp/androidApp/src/{main => androidMain}/AndroidManifest.xml (100%) rename experimental/examples/chat-mpp/androidApp/src/{main => androidMain}/kotlin/MainActivity.kt (100%) rename experimental/examples/chat-mpp/androidApp/src/{main => androidMain}/res/values/strings.xml (100%) rename experimental/examples/codeviewer/androidApp/src/{main => androidMain}/AndroidManifest.xml (100%) rename experimental/examples/codeviewer/androidApp/src/{main => androidMain}/assets/data/EditorView.kt (100%) rename experimental/examples/codeviewer/androidApp/src/{main/java => androidMain/kotlin}/org/jetbrains/codeviewer/MainActivity.kt (100%) rename experimental/examples/codeviewer/androidApp/src/{main => androidMain}/res/drawable/ic_launcher_foreground.xml (100%) rename experimental/examples/codeviewer/androidApp/src/{main => androidMain}/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename experimental/examples/codeviewer/androidApp/src/{main => androidMain}/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename experimental/examples/codeviewer/androidApp/src/{main => androidMain}/res/values/ic_launcher_background.xml (100%) rename experimental/examples/codeviewer/androidApp/src/{main => androidMain}/res/values/strings.xml (100%) rename experimental/examples/falling-balls-mpp/androidApp/src/{main => androidMain}/AndroidManifest.xml (100%) rename experimental/examples/falling-balls-mpp/androidApp/src/{main => androidMain}/kotlin/org/jetbrains/fallingballs/MainActivity.kt (100%) rename experimental/examples/falling-balls-mpp/androidApp/src/{main => androidMain}/res/values/strings.xml (100%) rename experimental/examples/imageviewer/androidApp/src/{main => androidMain}/AndroidManifest.xml (100%) rename experimental/examples/imageviewer/androidApp/src/{main/java => androidMain/kotlin}/example/imageviewer/MainActivity.kt (100%) rename experimental/examples/minesweeper/androidApp/src/{main => androidMain}/AndroidManifest.xml (100%) rename experimental/examples/minesweeper/androidApp/src/{main => androidMain}/kotlin/MainActivity.kt (100%) rename experimental/examples/minesweeper/androidApp/src/{main => androidMain}/res/values/strings.xml (100%) rename experimental/examples/todoapp-lite/androidApp/src/{main => androidMain}/AndroidManifest.xml (100%) rename experimental/examples/todoapp-lite/androidApp/src/{main/java => androidMain/kotlin}/example/todoapp/lite/MainActivity.kt (100%) rename experimental/examples/visual-effects/androidApp/src/{main => androidMain}/AndroidManifest.xml (100%) rename experimental/examples/visual-effects/androidApp/src/{main => androidMain}/kotlin/MainActivity.kt (100%) rename experimental/examples/visual-effects/androidApp/src/{main => androidMain}/res/values/strings.xml (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/AndroidManifest.xml (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/kotlin/org/jetbrains/compose/demo/widgets/MainActivity.kt (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/drawable-v24/ic_launcher_background.xml (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/drawable-v24/ic_launcher_foreground.xml (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-hdpi/ic_launcher.png (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-hdpi/ic_launcher_round.png (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-mdpi/ic_launcher.png (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-mdpi/ic_launcher_round.png (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-xhdpi/ic_launcher.png (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-xxhdpi/ic_launcher.png (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/values-night/themes.xml (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/values/colors.xml (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/values/strings.xml (100%) rename experimental/examples/widgets-gallery/androidApp/src/{main => androidMain}/res/values/themes.xml (100%) diff --git a/experimental/examples/chat-mpp/androidApp/src/main/AndroidManifest.xml b/experimental/examples/chat-mpp/androidApp/src/androidMain/AndroidManifest.xml similarity index 100% rename from experimental/examples/chat-mpp/androidApp/src/main/AndroidManifest.xml rename to experimental/examples/chat-mpp/androidApp/src/androidMain/AndroidManifest.xml diff --git a/experimental/examples/chat-mpp/androidApp/src/main/kotlin/MainActivity.kt b/experimental/examples/chat-mpp/androidApp/src/androidMain/kotlin/MainActivity.kt similarity index 100% rename from experimental/examples/chat-mpp/androidApp/src/main/kotlin/MainActivity.kt rename to experimental/examples/chat-mpp/androidApp/src/androidMain/kotlin/MainActivity.kt diff --git a/experimental/examples/chat-mpp/androidApp/src/main/res/values/strings.xml b/experimental/examples/chat-mpp/androidApp/src/androidMain/res/values/strings.xml similarity index 100% rename from experimental/examples/chat-mpp/androidApp/src/main/res/values/strings.xml rename to experimental/examples/chat-mpp/androidApp/src/androidMain/res/values/strings.xml diff --git a/experimental/examples/chat-mpp/gradle.properties b/experimental/examples/chat-mpp/gradle.properties index b4602ef0db..63a0e8dfb3 100644 --- a/experimental/examples/chat-mpp/gradle.properties +++ b/experimental/examples/chat-mpp/gradle.properties @@ -8,8 +8,7 @@ org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true -kotlin.native.enableDependencyPropagation=false -kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.0 diff --git a/experimental/examples/chat-mpp/shared/build.gradle.kts b/experimental/examples/chat-mpp/shared/build.gradle.kts index e9c19abb1d..63071e1624 100644 --- a/experimental/examples/chat-mpp/shared/build.gradle.kts +++ b/experimental/examples/chat-mpp/shared/build.gradle.kts @@ -65,7 +65,7 @@ kotlin { implementation("com.google.android.material:material:1.7.0") } } - val androidTest by getting { + val androidUnitTest by getting { dependencies { implementation("junit:junit:4.13.2") } diff --git a/experimental/examples/codeviewer/androidApp/src/main/AndroidManifest.xml b/experimental/examples/codeviewer/androidApp/src/androidMain/AndroidManifest.xml similarity index 100% rename from experimental/examples/codeviewer/androidApp/src/main/AndroidManifest.xml rename to experimental/examples/codeviewer/androidApp/src/androidMain/AndroidManifest.xml diff --git a/experimental/examples/codeviewer/androidApp/src/main/assets/data/EditorView.kt b/experimental/examples/codeviewer/androidApp/src/androidMain/assets/data/EditorView.kt similarity index 100% rename from experimental/examples/codeviewer/androidApp/src/main/assets/data/EditorView.kt rename to experimental/examples/codeviewer/androidApp/src/androidMain/assets/data/EditorView.kt diff --git a/experimental/examples/codeviewer/androidApp/src/main/java/org/jetbrains/codeviewer/MainActivity.kt b/experimental/examples/codeviewer/androidApp/src/androidMain/kotlin/org/jetbrains/codeviewer/MainActivity.kt similarity index 100% rename from experimental/examples/codeviewer/androidApp/src/main/java/org/jetbrains/codeviewer/MainActivity.kt rename to experimental/examples/codeviewer/androidApp/src/androidMain/kotlin/org/jetbrains/codeviewer/MainActivity.kt diff --git a/experimental/examples/codeviewer/androidApp/src/main/res/drawable/ic_launcher_foreground.xml b/experimental/examples/codeviewer/androidApp/src/androidMain/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from experimental/examples/codeviewer/androidApp/src/main/res/drawable/ic_launcher_foreground.xml rename to experimental/examples/codeviewer/androidApp/src/androidMain/res/drawable/ic_launcher_foreground.xml diff --git a/experimental/examples/codeviewer/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/experimental/examples/codeviewer/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from experimental/examples/codeviewer/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to experimental/examples/codeviewer/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/experimental/examples/codeviewer/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/experimental/examples/codeviewer/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from experimental/examples/codeviewer/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to experimental/examples/codeviewer/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/experimental/examples/codeviewer/androidApp/src/main/res/values/ic_launcher_background.xml b/experimental/examples/codeviewer/androidApp/src/androidMain/res/values/ic_launcher_background.xml similarity index 100% rename from experimental/examples/codeviewer/androidApp/src/main/res/values/ic_launcher_background.xml rename to experimental/examples/codeviewer/androidApp/src/androidMain/res/values/ic_launcher_background.xml diff --git a/experimental/examples/codeviewer/androidApp/src/main/res/values/strings.xml b/experimental/examples/codeviewer/androidApp/src/androidMain/res/values/strings.xml similarity index 100% rename from experimental/examples/codeviewer/androidApp/src/main/res/values/strings.xml rename to experimental/examples/codeviewer/androidApp/src/androidMain/res/values/strings.xml diff --git a/experimental/examples/codeviewer/gradle.properties b/experimental/examples/codeviewer/gradle.properties index 662d52bb4c..002855c0f5 100644 --- a/experimental/examples/codeviewer/gradle.properties +++ b/experimental/examples/codeviewer/gradle.properties @@ -8,8 +8,7 @@ org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true -kotlin.native.enableDependencyPropagation=false -kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.0 diff --git a/experimental/examples/falling-balls-mpp/androidApp/src/main/AndroidManifest.xml b/experimental/examples/falling-balls-mpp/androidApp/src/androidMain/AndroidManifest.xml similarity index 100% rename from experimental/examples/falling-balls-mpp/androidApp/src/main/AndroidManifest.xml rename to experimental/examples/falling-balls-mpp/androidApp/src/androidMain/AndroidManifest.xml diff --git a/experimental/examples/falling-balls-mpp/androidApp/src/main/kotlin/org/jetbrains/fallingballs/MainActivity.kt b/experimental/examples/falling-balls-mpp/androidApp/src/androidMain/kotlin/org/jetbrains/fallingballs/MainActivity.kt similarity index 100% rename from experimental/examples/falling-balls-mpp/androidApp/src/main/kotlin/org/jetbrains/fallingballs/MainActivity.kt rename to experimental/examples/falling-balls-mpp/androidApp/src/androidMain/kotlin/org/jetbrains/fallingballs/MainActivity.kt diff --git a/experimental/examples/falling-balls-mpp/androidApp/src/main/res/values/strings.xml b/experimental/examples/falling-balls-mpp/androidApp/src/androidMain/res/values/strings.xml similarity index 100% rename from experimental/examples/falling-balls-mpp/androidApp/src/main/res/values/strings.xml rename to experimental/examples/falling-balls-mpp/androidApp/src/androidMain/res/values/strings.xml diff --git a/experimental/examples/falling-balls-mpp/gradle.properties b/experimental/examples/falling-balls-mpp/gradle.properties index 662d52bb4c..002855c0f5 100644 --- a/experimental/examples/falling-balls-mpp/gradle.properties +++ b/experimental/examples/falling-balls-mpp/gradle.properties @@ -8,8 +8,7 @@ org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true -kotlin.native.enableDependencyPropagation=false -kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.0 diff --git a/experimental/examples/falling-balls-mpp/shared/build.gradle.kts b/experimental/examples/falling-balls-mpp/shared/build.gradle.kts index e9c19abb1d..63071e1624 100644 --- a/experimental/examples/falling-balls-mpp/shared/build.gradle.kts +++ b/experimental/examples/falling-balls-mpp/shared/build.gradle.kts @@ -65,7 +65,7 @@ kotlin { implementation("com.google.android.material:material:1.7.0") } } - val androidTest by getting { + val androidUnitTest by getting { dependencies { implementation("junit:junit:4.13.2") } diff --git a/experimental/examples/imageviewer/androidApp/src/main/AndroidManifest.xml b/experimental/examples/imageviewer/androidApp/src/androidMain/AndroidManifest.xml similarity index 100% rename from experimental/examples/imageviewer/androidApp/src/main/AndroidManifest.xml rename to experimental/examples/imageviewer/androidApp/src/androidMain/AndroidManifest.xml diff --git a/experimental/examples/imageviewer/androidApp/src/main/java/example/imageviewer/MainActivity.kt b/experimental/examples/imageviewer/androidApp/src/androidMain/kotlin/example/imageviewer/MainActivity.kt similarity index 100% rename from experimental/examples/imageviewer/androidApp/src/main/java/example/imageviewer/MainActivity.kt rename to experimental/examples/imageviewer/androidApp/src/androidMain/kotlin/example/imageviewer/MainActivity.kt diff --git a/experimental/examples/imageviewer/gradle.properties b/experimental/examples/imageviewer/gradle.properties index a2c1c6ab08..f14bbe94d8 100644 --- a/experimental/examples/imageviewer/gradle.properties +++ b/experimental/examples/imageviewer/gradle.properties @@ -7,9 +7,8 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true kotlin.native.cacheKind=none +kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.useEmbeddableCompilerJar=true -kotlin.native.enableDependencyPropagation=false -kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.0 diff --git a/experimental/examples/minesweeper/androidApp/src/main/AndroidManifest.xml b/experimental/examples/minesweeper/androidApp/src/androidMain/AndroidManifest.xml similarity index 100% rename from experimental/examples/minesweeper/androidApp/src/main/AndroidManifest.xml rename to experimental/examples/minesweeper/androidApp/src/androidMain/AndroidManifest.xml diff --git a/experimental/examples/minesweeper/androidApp/src/main/kotlin/MainActivity.kt b/experimental/examples/minesweeper/androidApp/src/androidMain/kotlin/MainActivity.kt similarity index 100% rename from experimental/examples/minesweeper/androidApp/src/main/kotlin/MainActivity.kt rename to experimental/examples/minesweeper/androidApp/src/androidMain/kotlin/MainActivity.kt diff --git a/experimental/examples/minesweeper/androidApp/src/main/res/values/strings.xml b/experimental/examples/minesweeper/androidApp/src/androidMain/res/values/strings.xml similarity index 100% rename from experimental/examples/minesweeper/androidApp/src/main/res/values/strings.xml rename to experimental/examples/minesweeper/androidApp/src/androidMain/res/values/strings.xml diff --git a/experimental/examples/minesweeper/gradle.properties b/experimental/examples/minesweeper/gradle.properties index 662d52bb4c..002855c0f5 100644 --- a/experimental/examples/minesweeper/gradle.properties +++ b/experimental/examples/minesweeper/gradle.properties @@ -8,8 +8,7 @@ org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true -kotlin.native.enableDependencyPropagation=false -kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.0 diff --git a/experimental/examples/minesweeper/shared/build.gradle.kts b/experimental/examples/minesweeper/shared/build.gradle.kts index d92f685626..b548ff1177 100644 --- a/experimental/examples/minesweeper/shared/build.gradle.kts +++ b/experimental/examples/minesweeper/shared/build.gradle.kts @@ -69,7 +69,7 @@ kotlin { implementation("com.google.android.material:material:1.7.0") } } - val androidTest by getting { + val androidUnitTest by getting { dependencies { implementation("junit:junit:4.13.2") } diff --git a/experimental/examples/todoapp-lite/androidApp/src/main/AndroidManifest.xml b/experimental/examples/todoapp-lite/androidApp/src/androidMain/AndroidManifest.xml similarity index 100% rename from experimental/examples/todoapp-lite/androidApp/src/main/AndroidManifest.xml rename to experimental/examples/todoapp-lite/androidApp/src/androidMain/AndroidManifest.xml diff --git a/experimental/examples/todoapp-lite/androidApp/src/main/java/example/todoapp/lite/MainActivity.kt b/experimental/examples/todoapp-lite/androidApp/src/androidMain/kotlin/example/todoapp/lite/MainActivity.kt similarity index 100% rename from experimental/examples/todoapp-lite/androidApp/src/main/java/example/todoapp/lite/MainActivity.kt rename to experimental/examples/todoapp-lite/androidApp/src/androidMain/kotlin/example/todoapp/lite/MainActivity.kt diff --git a/experimental/examples/todoapp-lite/gradle.properties b/experimental/examples/todoapp-lite/gradle.properties index 662d52bb4c..002855c0f5 100755 --- a/experimental/examples/todoapp-lite/gradle.properties +++ b/experimental/examples/todoapp-lite/gradle.properties @@ -8,8 +8,7 @@ org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true -kotlin.native.enableDependencyPropagation=false -kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.0 diff --git a/experimental/examples/visual-effects/androidApp/src/main/AndroidManifest.xml b/experimental/examples/visual-effects/androidApp/src/androidMain/AndroidManifest.xml similarity index 100% rename from experimental/examples/visual-effects/androidApp/src/main/AndroidManifest.xml rename to experimental/examples/visual-effects/androidApp/src/androidMain/AndroidManifest.xml diff --git a/experimental/examples/visual-effects/androidApp/src/main/kotlin/MainActivity.kt b/experimental/examples/visual-effects/androidApp/src/androidMain/kotlin/MainActivity.kt similarity index 100% rename from experimental/examples/visual-effects/androidApp/src/main/kotlin/MainActivity.kt rename to experimental/examples/visual-effects/androidApp/src/androidMain/kotlin/MainActivity.kt diff --git a/experimental/examples/visual-effects/androidApp/src/main/res/values/strings.xml b/experimental/examples/visual-effects/androidApp/src/androidMain/res/values/strings.xml similarity index 100% rename from experimental/examples/visual-effects/androidApp/src/main/res/values/strings.xml rename to experimental/examples/visual-effects/androidApp/src/androidMain/res/values/strings.xml diff --git a/experimental/examples/visual-effects/gradle.properties b/experimental/examples/visual-effects/gradle.properties index 662d52bb4c..201df576ce 100644 --- a/experimental/examples/visual-effects/gradle.properties +++ b/experimental/examples/visual-effects/gradle.properties @@ -6,10 +6,9 @@ org.gradle.jvmargs=-Xmx3g org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true +kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true -kotlin.native.enableDependencyPropagation=false -kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.0 diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/AndroidManifest.xml b/experimental/examples/widgets-gallery/androidApp/src/androidMain/AndroidManifest.xml similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/AndroidManifest.xml rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/AndroidManifest.xml diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/kotlin/org/jetbrains/compose/demo/widgets/MainActivity.kt b/experimental/examples/widgets-gallery/androidApp/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/MainActivity.kt similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/kotlin/org/jetbrains/compose/demo/widgets/MainActivity.kt rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/kotlin/org/jetbrains/compose/demo/widgets/MainActivity.kt diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/drawable-v24/ic_launcher_background.xml b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/drawable-v24/ic_launcher_background.xml similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/drawable-v24/ic_launcher_background.xml rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/drawable-v24/ic_launcher_background.xml diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/drawable-v24/ic_launcher_foreground.xml b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/values-night/themes.xml b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/values-night/themes.xml similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/values-night/themes.xml rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/values-night/themes.xml diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/values/colors.xml b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/values/colors.xml similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/values/colors.xml rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/values/colors.xml diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/values/strings.xml b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/values/strings.xml similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/values/strings.xml rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/values/strings.xml diff --git a/experimental/examples/widgets-gallery/androidApp/src/main/res/values/themes.xml b/experimental/examples/widgets-gallery/androidApp/src/androidMain/res/values/themes.xml similarity index 100% rename from experimental/examples/widgets-gallery/androidApp/src/main/res/values/themes.xml rename to experimental/examples/widgets-gallery/androidApp/src/androidMain/res/values/themes.xml diff --git a/experimental/examples/widgets-gallery/gradle.properties b/experimental/examples/widgets-gallery/gradle.properties index 662d52bb4c..002855c0f5 100644 --- a/experimental/examples/widgets-gallery/gradle.properties +++ b/experimental/examples/widgets-gallery/gradle.properties @@ -8,8 +8,7 @@ org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true -kotlin.native.enableDependencyPropagation=false -kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental kotlin.version=1.8.0