diff --git a/build.gradle.kts b/build.gradle.kts index b3f0cbf9..5688b086 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,18 +1,3 @@ -buildscript { - apply(from = "buildSrc/buildDependencies.gradle") - val build: Map by extra - repositories { - google() - jcenter() - } - dependencies { - classpath(build.getValue("androidGradlePlugin")) - classpath(build.getValue("daggerGradlePlugin")) - classpath(build.getValue("kotlinGradlePlugin")) - classpath(build.getValue("sqldelightGradlePlugin")) - } -} - plugins { id("com.github.ben-manes.versions") version "0.36.0" `lobsters-plugin` diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 41c457c3..d47bc94e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,6 +1,3 @@ -apply(from = "buildDependencies.gradle") -val build: Map by extra - plugins { `kotlin-dsl` } @@ -32,10 +29,10 @@ gradlePlugin { } dependencies { - implementation(build.getValue("kotlinGradlePlugin")) - implementation(build.getValue("daggerGradlePlugin")) - implementation(build.getValue("androidGradlePlugin")) - implementation(build.getValue("androidGradlePlugin_lintModel")) - implementation(build.getValue("jsemver")) - implementation(build.getValue("sqldelightGradlePlugin")) + implementation(Plugins.androidGradlePlugin) + implementation(Plugins.androidGradlePlugin_lintModel) + implementation(Plugins.daggerGradlePlugin) + implementation(Plugins.jsemver) + implementation(Plugins.kotlinGradlePlugin) + implementation(Plugins.sqldelightGradlePlugin) } diff --git a/buildSrc/buildDependencies.gradle b/buildSrc/buildDependencies.gradle deleted file mode 100644 index 3fd8a50c..00000000 --- a/buildSrc/buildDependencies.gradle +++ /dev/null @@ -1,17 +0,0 @@ -rootProject.ext.versions = [ - agp : '7.0.0-alpha05', - daggerHilt: '2.31.2-alpha', - kotlin : '1.4.21', - lint : '30.0.0-alpha05', - semver : '0.9.0', - sqldelight: '1.4.4', -] - -rootProject.ext.build = [ - androidGradlePlugin : "com.android.tools.build:gradle:${versions.agp}", - androidGradlePlugin_lintModel : "com.android.tools.lint:lint-model:${versions.lint}", - daggerGradlePlugin : "com.google.dagger:hilt-android-gradle-plugin:${versions.daggerHilt}", - kotlinGradlePlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}", - jsemver : "com.github.zafarkhaja:java-semver:${versions.semver}", - sqldelightGradlePlugin : "com.squareup.sqldelight:gradle-plugin:${versions.sqldelight}", -] diff --git a/buildSrc/buildSrc/build.gradle.kts b/buildSrc/buildSrc/build.gradle.kts new file mode 100644 index 00000000..7092e5dd --- /dev/null +++ b/buildSrc/buildSrc/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + `kotlin-dsl` +} + +repositories { + mavenCentral() + google() + gradlePluginPortal() +} + +kotlinDslPluginOptions { + experimentalWarning.set(false) +} + +// force compilation of Dependencies.kt so it can be referenced in buildSrc/build.gradle.kts +sourceSets.main { + java { + setSrcDirs(setOf(projectDir.parentFile.resolve("src/main/java"))) + include("Dependencies.kt") + } +} diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 175fd5be..2548c564 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -5,6 +5,15 @@ private const val DAGGER_HILT_VERSION = "2.31.2-alpha" +object Plugins { + const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha05" + const val androidGradlePlugin_lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha05" + const val daggerGradlePlugin = "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}" + const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21" + const val jsemver = "com.github.zafarkhaja:java-semver:0.9.0" + const val sqldelightGradlePlugin = "com.squareup.sqldelight:gradle-plugin:1.4.4" +} + object Dependencies { const val COMPOSE_VERSION = "1.0.0-alpha10"