diff --git a/build.gradle.kts b/build.gradle.kts index 65c024c8..b394472a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,10 +5,10 @@ import io.gitlab.arturbosch.detekt.Detekt // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { alias(libs.plugins.dokka) - alias(libs.plugins.android.library) apply false - alias(libs.plugins.android.application) apply false - alias(libs.plugins.kotlin.android) apply false - alias(libs.plugins.kotlin.parcelize) apply false +// id("com.android.library") + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.parcelize") alias(libs.plugins.ksp) apply false alias(libs.plugins.detekt) apply false alias(libs.plugins.ktlint) apply false @@ -37,10 +37,10 @@ val installGitHook by tasks.registering(Copy::class) { fileMode = "0777".toInt(8) } -val clean by tasks.registering(Delete::class) { - dependsOn(installGitHook) - delete(rootProject.buildDir) -} +//val clean by tasks.registering(Delete::class) { +// dependsOn(installGitHook) +// delete(rootProject.buildDir) +//} tasks.withType().configureEach { exclude(".*/resources/.*,.*/build/.*") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index b22ed732..1f021368 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,7 +1,20 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { `kotlin-dsl` } repositories { + google() mavenCentral() +} + +dependencies{ + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20") + implementation("com.android.tools.build:gradle:8.6.0") +} + +val compileKotlin:KotlinCompile by tasks +compileKotlin.kotlinOptions { + jvmTarget = "1.8" } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/PlutoGradlePlugin.kt b/buildSrc/src/main/kotlin/PlutoGradlePlugin.kt new file mode 100644 index 00000000..088e520f --- /dev/null +++ b/buildSrc/src/main/kotlin/PlutoGradlePlugin.kt @@ -0,0 +1,60 @@ +import org.gradle.api.Plugin +import org.gradle.api.Project +import com.android.build.gradle.LibraryExtension +import org.gradle.api.JavaVersion + +class PlutoGradlePlugin : Plugin { + override fun apply(project: Project) { + applyPlugins(project) + setProjectConfig(project) + } + + private fun applyPlugins(target: Project) { + target.apply { + plugin("android-library") + plugin("kotlin-android") + } + } + + private fun setProjectConfig(target: Project) { + val version = Versioning.loadVersioningData() + val verCode = version["code"] as Int + val verPublish = version["publish"] as String + val verGitSHA = version["gitSha"] as String + target.android().apply { + compileSdk = ProjectConfig.compileSdk + buildToolsVersion = ProjectConfig.buildTools + buildFeatures { + buildConfig = true + viewBinding = true + } + defaultConfig { + minSdk = ProjectConfig.minSdk + buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") + buildConfigField("long", "VERSION_CODE", "$verCode") + buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") + } + + buildTypes { + getByName("release") { + // isDebuggable = true + isMinifyEnabled = false + isShrinkResources = false + } + } + + compileOptions { + sourceCompatibility = JavaVersion.toVersion(ProjectConfig.java) + targetCompatibility = JavaVersion.toVersion(ProjectConfig.java) + } + lint { + abortOnError = false + targetSdk = ProjectConfig.targetSdk + } + } + } + + private fun Project.android(): LibraryExtension { + return extensions.getByType(LibraryExtension::class.java) + } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/ProjectConfig.kt b/buildSrc/src/main/kotlin/ProjectConfig.kt new file mode 100644 index 00000000..5511f863 --- /dev/null +++ b/buildSrc/src/main/kotlin/ProjectConfig.kt @@ -0,0 +1,27 @@ +object ProjectConfig { + const val testCore = "1.6.1" + const val coreTesting = "2.2.0" + const val java = "1.8" + const val minSdk = 21 + const val mockitoCore = "5.10.0" + const val robolectric = "4.11.1" + const val runner = "1.6.2" + const val targetSdk = 32 + const val compileSdk = 34 + const val buildTools = "34.0.0" + const val agp = "8.6.0" + const val androidXCore = "1.6.0" + const val androidXLifecycle = "2.8.7" + const val detekt = "1.19.0" + const val kotlin = "1.9.22" + const val ktlintPlugin = "11.1.0" + const val ktor = "2.3.2" + const val ksp = "1.9.22-1.0.16" + const val moshi = "1.15.1" + const val navigation = "2.8.6" + const val okhttp = "4.12.0" + const val retrofit = "2.9.0" + const val room = "2.5.1" + const val mavenPublish = "0.28.0" +} + diff --git a/pluto-plugins/base/lib/build.gradle.kts b/pluto-plugins/base/lib/build.gradle.kts index f60cd850..63743955 100644 --- a/pluto-plugins/base/lib/build.gradle.kts +++ b/pluto-plugins/base/lib/build.gradle.kts @@ -1,8 +1,8 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } diff --git a/pluto-plugins/bundle/lib-no-op/build.gradle.kts b/pluto-plugins/bundle/lib-no-op/build.gradle.kts index 10325711..4f4116e5 100644 --- a/pluto-plugins/bundle/lib-no-op/build.gradle.kts +++ b/pluto-plugins/bundle/lib-no-op/build.gradle.kts @@ -1,8 +1,8 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } @@ -10,42 +10,9 @@ val version = Versioning.loadVersioningData() val verCode = version["code"] as Int val verPublish = version["publish"] as String val verGitSHA = version["gitSha"] as String - +apply() android { namespace = "com.pluto.plugins.bundle.core" - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/bundle/lib/build.gradle.kts b/pluto-plugins/bundle/lib/build.gradle.kts index 715329e2..f8cbd3ca 100644 --- a/pluto-plugins/bundle/lib/build.gradle.kts +++ b/pluto-plugins/bundle/lib/build.gradle.kts @@ -1,8 +1,8 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } diff --git a/pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts index f1bb514c..933d9fe0 100644 --- a/pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts @@ -1,51 +1,18 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String + +apply() android { namespace = "com.pluto.plugins.datastore.pref" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/datastore/lib/build.gradle.kts b/pluto-plugins/plugins/datastore/lib/build.gradle.kts index 88be0581..4eb32576 100644 --- a/pluto-plugins/plugins/datastore/lib/build.gradle.kts +++ b/pluto-plugins/plugins/datastore/lib/build.gradle.kts @@ -1,58 +1,20 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) alias(libs.plugins.ksp) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String + +apply() android { namespace = "com.pluto.plugins.datastore.pref" resourcePrefix = "pluto_dts___" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - - buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") - buildConfigField("long", "VERSION_CODE", "$verCode") - buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle.kts index 04cdf756..0e2c42c7 100644 --- a/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle.kts @@ -1,51 +1,17 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String +apply() android { namespace = "com.pluto.plugins.exceptions" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/exceptions/lib/build.gradle.kts b/pluto-plugins/plugins/exceptions/lib/build.gradle.kts index bb6085b9..ea1112aa 100644 --- a/pluto-plugins/plugins/exceptions/lib/build.gradle.kts +++ b/pluto-plugins/plugins/exceptions/lib/build.gradle.kts @@ -1,59 +1,21 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) + id("com.android.library") + id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.parcelize") alias(libs.plugins.ksp) alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String + +apply() android { namespace = "com.pluto.plugins.exceptions" resourcePrefix = "pluto_excep___" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - - buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") - buildConfigField("long", "VERSION_CODE", "$verCode") - buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/layout-inspector/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/layout-inspector/lib-no-op/build.gradle.kts index f5ea5f2e..5b9ebd92 100644 --- a/pluto-plugins/plugins/layout-inspector/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/layout-inspector/lib-no-op/build.gradle.kts @@ -1,51 +1,17 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String +apply() android { namespace = "com.pluto.plugins.layoutinspector" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/layout-inspector/lib/build.gradle.kts b/pluto-plugins/plugins/layout-inspector/lib/build.gradle.kts index d522e4c4..ff1b1a2b 100644 --- a/pluto-plugins/plugins/layout-inspector/lib/build.gradle.kts +++ b/pluto-plugins/plugins/layout-inspector/lib/build.gradle.kts @@ -1,57 +1,19 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String + +apply() android { namespace = "com.pluto.plugins.layoutinspector" resourcePrefix = "pluto_li___" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - - buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") - buildConfigField("long", "VERSION_CODE", "$verCode") - buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts index b94d835f..f3f11270 100644 --- a/pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts @@ -1,52 +1,19 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String + +apply() android { namespace = "com.pluto.plugins.logger" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/logger/lib/build.gradle.kts b/pluto-plugins/plugins/logger/lib/build.gradle.kts index a1d09d09..1bcf9bde 100644 --- a/pluto-plugins/plugins/logger/lib/build.gradle.kts +++ b/pluto-plugins/plugins/logger/lib/build.gradle.kts @@ -1,59 +1,21 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) + id("com.android.library") + id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.parcelize") alias(libs.plugins.ksp) alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String + +apply() android { resourcePrefix = "pluto_logger___" namespace = "com.pluto.plugins.logger" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - - buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") - buildConfigField("long", "VERSION_CODE", "$verCode") - buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/network/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/network/lib-no-op/build.gradle.kts index 2f3f4be8..c83dc6c0 100644 --- a/pluto-plugins/plugins/network/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/network/lib-no-op/build.gradle.kts @@ -1,51 +1,18 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String + +apply() android { namespace = "com.pluto.plugins.network" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/network/lib/build.gradle.kts b/pluto-plugins/plugins/network/lib/build.gradle.kts index 6ad41503..a6ea35ea 100644 --- a/pluto-plugins/plugins/network/lib/build.gradle.kts +++ b/pluto-plugins/plugins/network/lib/build.gradle.kts @@ -1,59 +1,21 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) + id("com.android.library") + id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.parcelize") alias(libs.plugins.ksp) alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String + +apply() android { resourcePrefix = "pluto_network___" namespace = "com.pluto.plugins.network" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - - buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") - buildConfigField("long", "VERSION_CODE", "$verCode") - buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/rooms-database/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/rooms-database/lib-no-op/build.gradle.kts index 0c18f250..f20a2779 100644 --- a/pluto-plugins/plugins/rooms-database/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/rooms-database/lib-no-op/build.gradle.kts @@ -1,51 +1,18 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String + +apply() android { namespace = "com.pluto.plugins.rooms.db" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/rooms-database/lib/build.gradle.kts b/pluto-plugins/plugins/rooms-database/lib/build.gradle.kts index 284b5b28..b8c834d0 100644 --- a/pluto-plugins/plugins/rooms-database/lib/build.gradle.kts +++ b/pluto-plugins/plugins/rooms-database/lib/build.gradle.kts @@ -1,59 +1,21 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) + id("com.android.library") + id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.parcelize") alias(libs.plugins.ksp) alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String + +apply() android { resourcePrefix = "pluto_rooms___" namespace = "com.pluto.plugins.rooms.db" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - - buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") - buildConfigField("long", "VERSION_CODE", "$verCode") - buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/shared-preferences/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/shared-preferences/lib-no-op/build.gradle.kts index 8eb4257e..ff4c1ac2 100644 --- a/pluto-plugins/plugins/shared-preferences/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/shared-preferences/lib-no-op/build.gradle.kts @@ -1,51 +1,17 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String +apply() android { namespace = "com.pluto.plugins.preferences" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto-plugins/plugins/shared-preferences/lib/build.gradle.kts b/pluto-plugins/plugins/shared-preferences/lib/build.gradle.kts index f013caba..e2437153 100644 --- a/pluto-plugins/plugins/shared-preferences/lib/build.gradle.kts +++ b/pluto-plugins/plugins/shared-preferences/lib/build.gradle.kts @@ -1,58 +1,19 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.ksp) alias(libs.plugins.maven.publish) } val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String +apply() android { resourcePrefix = "pluto_pref___" namespace = "com.pluto.plugins.preferences" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - - buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") - buildConfigField("long", "VERSION_CODE", "$verCode") - buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" diff --git a/pluto/lib-no-op/build.gradle.kts b/pluto/lib-no-op/build.gradle.kts index 702efb9a..b891ac52 100644 --- a/pluto/lib-no-op/build.gradle.kts +++ b/pluto/lib-no-op/build.gradle.kts @@ -1,8 +1,8 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.maven.publish) } @@ -10,46 +10,9 @@ val version = Versioning.loadVersioningData() val verCode = version["code"] as Int val verPublish = version["publish"] as String val verGitSHA = version["gitSha"] as String - +apply() android { namespace = "com.pluto" - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - - buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") - buildConfigField("long", "VERSION_CODE", "$verCode") - buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } } extra["PUBLISH_GROUP_ID"] = "com.androidpluto" diff --git a/pluto/lib/build.gradle.kts b/pluto/lib/build.gradle.kts index 02e42b21..8748c46e 100644 --- a/pluto/lib/build.gradle.kts +++ b/pluto/lib/build.gradle.kts @@ -1,8 +1,8 @@ import com.vanniktech.maven.publish.SonatypeHost plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) + id("com.android.library") + id("org.jetbrains.kotlin.android") alias(libs.plugins.ksp) alias(libs.plugins.maven.publish) } diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 427a2253..e8a39f49 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) + id("com.android.application") + id("org.jetbrains.kotlin.android") alias(libs.plugins.ksp) alias(libs.plugins.ktlint) alias(libs.plugins.kotlin.serialization)