diff --git a/experimental/examples/falling-balls-mpp/build.gradle.kts b/experimental/examples/falling-balls-mpp/build.gradle.kts index 7f0152d841..bf95fe23b1 100644 --- a/experimental/examples/falling-balls-mpp/build.gradle.kts +++ b/experimental/examples/falling-balls-mpp/build.gradle.kts @@ -1,22 +1,18 @@ -buildscript { - repositories { - gradlePluginPortal() - google() - mavenCentral() - mavenLocal() - } - dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") - classpath("com.android.tools.build:gradle:7.3.1") - classpath("org.jetbrains.compose:compose-gradle-plugin:1.2.1") - } +plugins { + // this is necessary to avoid the plugins to be loaded multiple times + // in each subproject's classloader + kotlin("jvm") apply false + kotlin("multiplatform") apply false + kotlin("android") apply false + id("com.android.application") apply false + id("com.android.library") apply false + id("org.jetbrains.compose") apply false } -allprojects { +subprojects { repositories { google() mavenCentral() - mavenLocal() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } -} \ No newline at end of file +} diff --git a/experimental/examples/falling-balls-mpp/gradle.properties b/experimental/examples/falling-balls-mpp/gradle.properties index 00c8bf1343..d589487b61 100644 --- a/experimental/examples/falling-balls-mpp/gradle.properties +++ b/experimental/examples/falling-balls-mpp/gradle.properties @@ -12,3 +12,6 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental +kotlin.version=1.7.20 +agp.version=7.1.3 +compose.version=1.2.1 diff --git a/experimental/examples/falling-balls-mpp/settings.gradle.kts b/experimental/examples/falling-balls-mpp/settings.gradle.kts index 8474ea5a4e..95b7916058 100644 --- a/experimental/examples/falling-balls-mpp/settings.gradle.kts +++ b/experimental/examples/falling-balls-mpp/settings.gradle.kts @@ -1,12 +1,25 @@ pluginManagement { repositories { - google() - jcenter() gradlePluginPortal() - mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + google() + } + + plugins { + val kotlinVersion = extra["kotlin.version"] as String + val agpVersion = extra["agp.version"] as String + val composeVersion = extra["compose.version"] as String + + kotlin("jvm").version(kotlinVersion) + kotlin("multiplatform").version(kotlinVersion) + kotlin("android").version(kotlinVersion) + id("com.android.base").version(agpVersion) + id("com.android.application").version(agpVersion) + id("com.android.library").version(agpVersion) + id("org.jetbrains.compose").version(composeVersion) } - } + rootProject.name = "falling-balls-mpp" include(":androidApp") diff --git a/experimental/examples/widgets-gallery/build.gradle.kts b/experimental/examples/widgets-gallery/build.gradle.kts index caa18ecb7a..bf95fe23b1 100644 --- a/experimental/examples/widgets-gallery/build.gradle.kts +++ b/experimental/examples/widgets-gallery/build.gradle.kts @@ -1,22 +1,18 @@ -buildscript { - repositories { - gradlePluginPortal() - google() - mavenCentral() - mavenLocal() - } - dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") - classpath("com.android.tools.build:gradle:7.3.1") - classpath("org.jetbrains.compose:compose-gradle-plugin:1.2.1") - } +plugins { + // this is necessary to avoid the plugins to be loaded multiple times + // in each subproject's classloader + kotlin("jvm") apply false + kotlin("multiplatform") apply false + kotlin("android") apply false + id("com.android.application") apply false + id("com.android.library") apply false + id("org.jetbrains.compose") apply false } -allprojects { +subprojects { repositories { google() mavenCentral() - mavenLocal() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/experimental/examples/widgets-gallery/gradle.properties b/experimental/examples/widgets-gallery/gradle.properties index 00c8bf1343..d589487b61 100644 --- a/experimental/examples/widgets-gallery/gradle.properties +++ b/experimental/examples/widgets-gallery/gradle.properties @@ -12,3 +12,6 @@ kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental +kotlin.version=1.7.20 +agp.version=7.1.3 +compose.version=1.2.1 diff --git a/experimental/examples/widgets-gallery/settings.gradle.kts b/experimental/examples/widgets-gallery/settings.gradle.kts index 384af83852..76eb8f5ec8 100644 --- a/experimental/examples/widgets-gallery/settings.gradle.kts +++ b/experimental/examples/widgets-gallery/settings.gradle.kts @@ -1,12 +1,25 @@ pluginManagement { repositories { - google() - jcenter() gradlePluginPortal() - mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + google() + } + + plugins { + val kotlinVersion = extra["kotlin.version"] as String + val agpVersion = extra["agp.version"] as String + val composeVersion = extra["compose.version"] as String + + kotlin("jvm").version(kotlinVersion) + kotlin("multiplatform").version(kotlinVersion) + kotlin("android").version(kotlinVersion) + id("com.android.base").version(agpVersion) + id("com.android.application").version(agpVersion) + id("com.android.library").version(agpVersion) + id("org.jetbrains.compose").version(composeVersion) } - } + rootProject.name = "widgets-gallery" include(":androidApp")