From 41e7513a7f49f496585e78ffabae6d152a83da7e Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sat, 22 Feb 2025 01:57:20 +0530 Subject: [PATCH 01/11] migrated sample app build to kotlin --- .gitignore | 3 + buildSrc/build.gradle.kts | 7 ++ buildSrc/src/main/kotlin/Versioning.kt | 40 ++++++++++ sample/{build.gradle => build.gradle.kts} | 90 ++++++++++++----------- scripts/static-analysis/.editorconfig | 2 +- 5 files changed, 98 insertions(+), 44 deletions(-) create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/kotlin/Versioning.kt rename sample/{build.gradle => build.gradle.kts} (50%) diff --git a/.gitignore b/.gitignore index 4406bafa4..142389e13 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ .cxx /.idea/* /scripts/publish/_credentials.properties +/scripts/publish/_newCreds.properties +*.gpg +/buildSrc/build diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 000000000..b22ed732f --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + `kotlin-dsl` +} + +repositories { + mavenCentral() +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versioning.kt b/buildSrc/src/main/kotlin/Versioning.kt new file mode 100644 index 000000000..b62113ba3 --- /dev/null +++ b/buildSrc/src/main/kotlin/Versioning.kt @@ -0,0 +1,40 @@ +import java.io.File +import java.util.Properties + +object Versioning { + fun loadVersioningData(): Map { + val version = mutableMapOf() + + val versionProps = Properties().apply { + load(File("${System.getProperty("user.dir")}/version.properties").inputStream()) + } + + val versionMajor = versionProps["major"]?.toString()?.toInt() ?: 0 + val versionMinor = versionProps["minor"]?.toString()?.toInt() ?: 0 + val versionPatch = versionProps["patch"]?.toString()?.toInt() ?: 0 + val versionBuild = versionProps["build"]?.toString()?.toInt() ?: 0 + val versionChannel = versionProps["channel"]?.toString() ?: "release" + + version["code"] = (versionMajor * 1_000_000) + (versionMinor * 10_000) + (versionPatch * 100) + versionBuild + version["name"] = "$versionMajor.$versionMinor.$versionPatch-rc$versionBuild" + + var publishVersion = "$versionMajor.$versionMinor.$versionPatch" + if (versionChannel != "release") { + publishVersion = "$publishVersion-$versionChannel$versionBuild" + } + version["publish"] = publishVersion + + val gitSha = "git rev-parse --short=10 HEAD".runCommand()?.trim() ?: "" + version["gitSha"] = gitSha + + return version + } + + private fun String.runCommand(): String? { + return try { + ProcessBuilder("/bin/sh", "-c", this).start().inputStream.bufferedReader().readText() + } catch (e: Exception) { + null + } + } +} diff --git a/sample/build.gradle b/sample/build.gradle.kts similarity index 50% rename from sample/build.gradle rename to sample/build.gradle.kts index 1ff053f82..fda43693f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle.kts @@ -1,3 +1,5 @@ +import Versioning.loadVersioningData + plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) @@ -6,62 +8,64 @@ plugins { alias(libs.plugins.kotlin.serialization) } -apply from: "$rootDir/scripts/version.gradle" - -def version = loadVersioningData() -def verCode = version["code"] -def verPublish = version["publish"] +val version = loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String android { - compileSdk = libs.versions.compileSdk.get().toInteger() + compileSdk = libs.versions.compileSdk.get().toInt() buildToolsVersion = libs.versions.buildTools.get() buildFeatures { - viewBinding true - buildConfig true + viewBinding = true + buildConfig = true } defaultConfig { - applicationId "com.sampleapp" - minSdk = libs.versions.minSdk.get().toInteger() - targetSdk = libs.versions.targetSdk.get().toInteger() - versionCode verCode - versionName verPublish + applicationId = "com.sampleapp" + minSdk = libs.versions.minSdk.get().toInt() + targetSdk = libs.versions.targetSdk.get().toInt() + versionCode = verCode + versionName = verPublish - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { /** * build type with lib modules */ - debug { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + getByName("debug") { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" + ) } - debugMaven { - initWith debug - signingConfig signingConfigs.debug - matchingFallbacks = ['debug'] + create("debugMaven") { + initWith(getByName("debug")) + signingConfig = signingConfigs.getByName("debug") + matchingFallbacks.add("debug") } /** * build type with lib-no-op modules */ - debugNoOp { - initWith debug - signingConfig signingConfigs.debug - matchingFallbacks = ['debug'] + create("debugNoOp") { + initWith(getByName("debug")) + signingConfig = signingConfigs.getByName("debug") + matchingFallbacks.add("debug") } - debugNoOpMaven { - initWith debug - signingConfig signingConfigs.debug - matchingFallbacks = ['debug'] + create("debugNoOpMaven") { + initWith(getByName("debug")) + signingConfig = signingConfigs.getByName("debug") + matchingFallbacks.add("debug") } - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + getByName("release") { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" + ) } } compileOptions { @@ -72,28 +76,28 @@ android { kotlinOptions { jvmTarget = libs.versions.java.get() } - namespace 'com.sampleapp' + namespace = "com.sampleapp" } dependencies { /* Local Op dependencies */ - debugImplementation project(path: ':pluto:lib') - debugImplementation project(path: ':pluto-plugins:bundle:lib') + "debugImplementation"(project(mapOf("path" to ":pluto:lib"))) + "debugImplementation"(project(mapOf("path" to ":pluto-plugins:bundle:lib"))) /* Maven Op dependencies */ - debugMavenImplementation "com.plutolib:pluto:$verPublish" - debugMavenImplementation "com.plutolib.plugins:bundle-core:$verPublish" + "debugMavenImplementation"("com.plutolib:pluto:$verPublish") + "debugMavenImplementation"("com.plutolib.plugins:bundle-core:$verPublish") /* Local NoOp dependencies */ - debugNoOpImplementation project(path: ':pluto:lib-no-op') - debugNoOpImplementation project(path: ':pluto-plugins:bundle:lib-no-op') + "debugNoOpImplementation"(project(mapOf("path" to ":pluto:lib-no-op"))) + "debugNoOpImplementation"(project(mapOf("path" to ":pluto-plugins:bundle:lib-no-op"))) /* Maven NoOp dependencies */ - debugNoOpMavenImplementation "com.plutolib:pluto-no-op:$verPublish" - debugNoOpMavenImplementation "com.plutolib.plugins:bundle-core-no-op:$verPublish" + "debugNoOpMavenImplementation"("com.plutolib:pluto-no-op:$verPublish") + "debugNoOpMavenImplementation"("com.plutolib.plugins:bundle-core-no-op:$verPublish") - releaseImplementation "com.plutolib:pluto:$verPublish" - releaseImplementation "com.plutolib.plugins:bundle-core:$verPublish" + "releaseImplementation"("com.plutolib:pluto:$verPublish") + "releaseImplementation"("com.plutolib.plugins:bundle-core:$verPublish") /** * Other dependencies diff --git a/scripts/static-analysis/.editorconfig b/scripts/static-analysis/.editorconfig index a49126efb..8914c9d0f 100644 --- a/scripts/static-analysis/.editorconfig +++ b/scripts/static-analysis/.editorconfig @@ -1,5 +1,5 @@ [*.{kt, kts}] -max_line_length = 160 +max_line_length = 200 insert_final_newline = true indent_size = 4 indent_style = space \ No newline at end of file From e8e22171859be71e57be634fdfe92e9791616f61 Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sat, 22 Feb 2025 17:04:28 +0530 Subject: [PATCH 02/11] pluto - groovy to kotlin --- pluto/lib-no-op/build.gradle | 18 -------- pluto/lib-no-op/build.gradle.kts | 59 ++++++++++++++++++++++++++ pluto/lib/build.gradle | 32 -------------- pluto/lib/build.gradle.kts | 72 ++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 50 deletions(-) delete mode 100644 pluto/lib-no-op/build.gradle create mode 100644 pluto/lib-no-op/build.gradle.kts delete mode 100644 pluto/lib/build.gradle create mode 100644 pluto/lib/build.gradle.kts diff --git a/pluto/lib-no-op/build.gradle b/pluto/lib-no-op/build.gradle deleted file mode 100644 index 502a5f2cc..000000000 --- a/pluto/lib-no-op/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib" - PUBLISH_ARTIFACT_ID = 'pluto-no-op' -} - -android { - namespace 'com.pluto' -} - -dependencies { - implementation(libs.androidx.core) -} \ No newline at end of file diff --git a/pluto/lib-no-op/build.gradle.kts b/pluto/lib-no-op/build.gradle.kts new file mode 100644 index 000000000..c091d6e23 --- /dev/null +++ b/pluto/lib-no-op/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib" +extra["PUBLISH_ARTIFACT_ID"] = "pluto-no-op" +extra["PUBLISH_VERSION"] = verPublish + +android { + namespace = "com.pluto" +// configureAndroid() + 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() + } +} + +dependencies { + implementation(libs.androidx.core) +} diff --git a/pluto/lib/build.gradle b/pluto/lib/build.gradle deleted file mode 100644 index 02624cb75..000000000 --- a/pluto/lib/build.gradle +++ /dev/null @@ -1,32 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.ksp) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib" - PUBLISH_ARTIFACT_ID = 'pluto' -} - -android { - resourcePrefix 'pluto___' - namespace 'com.pluto' -} - -dependencies { - api project(path: ':pluto-plugins:base:lib') - - implementation(libs.androidx.core) - implementation(libs.androidx.appcompat) - - implementation(libs.retrofit) - implementation(libs.retrofit.converter.moshi) - implementation(libs.okhttp.logging.interceptor) - implementation(libs.okhttp) - implementation(libs.okio) - - implementation(libs.moshi) - ksp(libs.moshi.codegen) -} \ No newline at end of file diff --git a/pluto/lib/build.gradle.kts b/pluto/lib/build.gradle.kts new file mode 100644 index 000000000..840ac9177 --- /dev/null +++ b/pluto/lib/build.gradle.kts @@ -0,0 +1,72 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + 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 + +extra["PUBLISH_GROUP_ID"] = "com.plutolib" +extra["PUBLISH_ARTIFACT_ID"] = "pluto" +extra["PUBLISH_VERSION"] = verPublish + +android { + namespace = "com.pluto" + resourcePrefix = "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() + } +} + +dependencies { + api(project(":pluto-plugins:base:lib")) + + implementation(libs.androidx.core) + implementation(libs.androidx.appcompat) + + implementation(libs.retrofit) + implementation(libs.retrofit.converter.moshi) + implementation(libs.okhttp.logging.interceptor) + implementation(libs.okhttp) + implementation(libs.okio) + + implementation(libs.moshi) + ksp(libs.moshi.codegen) +} From 49b72ce8819f482f4b86b7be30a8ea22d962c6d6 Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sat, 22 Feb 2025 17:33:33 +0530 Subject: [PATCH 03/11] plugins - groovy to kotlin --- build.gradle | 51 ------------- build.gradle.kts | 55 ++++++++++++++ pluto-plugins/base/lib/build.gradle | 31 -------- pluto-plugins/base/lib/build.gradle.kts | 71 +++++++++++++++++++ pluto-plugins/bundle/lib-no-op/build.gradle | 26 ------- .../bundle/lib-no-op/build.gradle.kts | 66 +++++++++++++++++ pluto-plugins/bundle/lib/build.gradle | 26 ------- pluto-plugins/bundle/lib/build.gradle.kts | 66 +++++++++++++++++ 8 files changed, 258 insertions(+), 134 deletions(-) delete mode 100644 build.gradle create mode 100644 build.gradle.kts delete mode 100644 pluto-plugins/base/lib/build.gradle create mode 100644 pluto-plugins/base/lib/build.gradle.kts delete mode 100644 pluto-plugins/bundle/lib-no-op/build.gradle create mode 100644 pluto-plugins/bundle/lib-no-op/build.gradle.kts delete mode 100644 pluto-plugins/bundle/lib/build.gradle create mode 100644 pluto-plugins/bundle/lib/build.gradle.kts diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 7f38e0631..000000000 --- a/build.gradle +++ /dev/null @@ -1,51 +0,0 @@ -// 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 - alias(libs.plugins.ksp) apply false - alias(libs.plugins.detekt) apply false - alias(libs.plugins.ktlint) apply false -} - -allprojects { - repositories { - google() - mavenCentral() - // for testing Pluto staged repository - maven { url "https://s01.oss.sonatype.org/content/groups/staging/" } - } -} - -subprojects { -// if (project.name != "pluto-no-op") { - pluginManager.withPlugin('kotlin-android') { - apply from: "$rootDir/scripts/static-analysis/code-analysis.gradle" - } -// } -} - -task installGitHook(type: Copy) { - from new File(rootProject.rootDir, 'pre-commit') - into { new File(rootProject.rootDir, '.git/hooks') } - fileMode 0777 -} - -task clean(type: Delete) { - dependsOn(installGitHook) - delete rootProject.buildDir -} - -tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach { - exclude(".*/resources/.*,.*/build/.*") -} - -task prCheck { - dependsOn ':sample:assembleDebug' - dependsOn ':pluto:validateChanges' -} - -apply from: "$rootDir/scripts/project-dependancy-graph.gradle" -apply from: "$rootDir/maven-versions.gradle" \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..19701d0c2 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,55 @@ +import org.gradle.api.tasks.Copy +import org.gradle.api.tasks.Delete +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 + alias(libs.plugins.ksp) apply false + alias(libs.plugins.detekt) apply false + alias(libs.plugins.ktlint) apply false +} + +allprojects { + repositories { + google() + mavenCentral() + // for testing Pluto staged repository + maven("https://s01.oss.sonatype.org/content/groups/staging/") + } +} + +subprojects { +// if (project.name != "pluto-no-op") { + pluginManager.withPlugin("kotlin-android") { + apply (from = "$rootDir/scripts/static-analysis/code-analysis.gradle") + } +// } +} + +val installGitHook by tasks.registering(Copy::class) { + from(File(rootProject.rootDir, "pre-commit")) + into(File(rootProject.rootDir, ".git/hooks")) + fileMode = "0777".toInt(8) +} + +val clean by tasks.registering(Delete::class) { + dependsOn(installGitHook) + delete(rootProject.buildDir) +} + +tasks.withType().configureEach { + exclude(".*/resources/.*,.*/build/.*") +} + +val prCheck by tasks.registering { + dependsOn(":sample:assembleDebug") + dependsOn(":pluto:validateChanges") +} + +apply (from = "$rootDir/scripts/project-dependancy-graph.gradle") +apply (from = "$rootDir/maven-versions.gradle") \ No newline at end of file diff --git a/pluto-plugins/base/lib/build.gradle b/pluto-plugins/base/lib/build.gradle deleted file mode 100644 index f75c56dc5..000000000 --- a/pluto-plugins/base/lib/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib" - PUBLISH_ARTIFACT_ID = 'plugin' -} - -android { - resourcePrefix 'pluto___' - namespace 'com.pluto.plugin' -} - -dependencies { - implementation(libs.androidx.core) - implementation(libs.androidx.appcompat) - - api(libs.androidx.constraintlayout) - api(libs.androidx.navigation.fragment) - api(libs.androidx.recyclerview) - - api(libs.google.material) - - api(libs.androidx.cardview) - - api(libs.androidx.lifecycle.common) - api(libs.androidx.lifecycle.runtime) -} \ No newline at end of file diff --git a/pluto-plugins/base/lib/build.gradle.kts b/pluto-plugins/base/lib/build.gradle.kts new file mode 100644 index 000000000..faee1f0b2 --- /dev/null +++ b/pluto-plugins/base/lib/build.gradle.kts @@ -0,0 +1,71 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib" +extra["PUBLISH_ARTIFACT_ID"] = "plugin" +extra["PUBLISH_VERSION"] = verPublish + +android { + namespace = "com.pluto.plugin" + resourcePrefix = "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() + } +} + +dependencies { + implementation(libs.androidx.core) + implementation(libs.androidx.appcompat) + + api(libs.androidx.constraintlayout) + api(libs.androidx.navigation.fragment) + api(libs.androidx.recyclerview) + + api(libs.google.material) + + api(libs.androidx.cardview) + + api(libs.androidx.lifecycle.common) + api(libs.androidx.lifecycle.runtime) +} diff --git a/pluto-plugins/bundle/lib-no-op/build.gradle b/pluto-plugins/bundle/lib-no-op/build.gradle deleted file mode 100644 index 7532bace8..000000000 --- a/pluto-plugins/bundle/lib-no-op/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'bundle-core-no-op' -} - -android { - namespace 'com.pluto.plugins.bundle.core' -} - -dependencies { - api project(path: ':pluto-plugins:plugins:exceptions:lib-no-op') - api project(path: ':pluto-plugins:plugins:network:core:lib-no-op') - api project(path: ':pluto-plugins:plugins:network:interceptor-okhttp:lib-no-op') - api project(path: ':pluto-plugins:plugins:network:interceptor-ktor:lib-no-op') - api project(path: ':pluto-plugins:plugins:shared-preferences:lib-no-op') - api project(path: ':pluto-plugins:plugins:logger:lib-no-op') - api project(path: ':pluto-plugins:plugins:datastore:lib-no-op') - api project(path: ':pluto-plugins:plugins:rooms-database:lib-no-op') - api project(path: ':pluto-plugins:plugins:layout-inspector:lib-no-op') -} \ No newline at end of file diff --git a/pluto-plugins/bundle/lib-no-op/build.gradle.kts b/pluto-plugins/bundle/lib-no-op/build.gradle.kts new file mode 100644 index 000000000..f038ad0db --- /dev/null +++ b/pluto-plugins/bundle/lib-no-op/build.gradle.kts @@ -0,0 +1,66 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "bundle-core-no-op" +extra["PUBLISH_VERSION"] = verPublish + +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() + +// 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() + } +} + +dependencies { + api(project(":pluto-plugins:plugins:exceptions:lib-no-op")) + api(project(":pluto-plugins:plugins:network:core:lib-no-op")) + api(project(":pluto-plugins:plugins:network:interceptor-ktor:lib-no-op")) + api(project(":pluto-plugins:plugins:network:interceptor-okhttp:lib-no-op")) + api(project(":pluto-plugins:plugins:shared-preferences:lib-no-op")) + api(project(":pluto-plugins:plugins:logger:lib-no-op")) + api(project(":pluto-plugins:plugins:datastore:lib-no-op")) + api(project(":pluto-plugins:plugins:rooms-database:lib-no-op")) + api(project(":pluto-plugins:plugins:layout-inspector:lib-no-op")) +} diff --git a/pluto-plugins/bundle/lib/build.gradle b/pluto-plugins/bundle/lib/build.gradle deleted file mode 100644 index 2f56e0698..000000000 --- a/pluto-plugins/bundle/lib/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'bundle-core' -} - -android { - namespace 'com.pluto.plugins.bundle.core' -} - -dependencies { - api project(path: ':pluto-plugins:plugins:exceptions:lib') - api project(path: ':pluto-plugins:plugins:network:core:lib') - api project(path: ':pluto-plugins:plugins:network:interceptor-ktor:lib') - api project(path: ':pluto-plugins:plugins:network:interceptor-okhttp:lib') - api project(path: ':pluto-plugins:plugins:shared-preferences:lib') - api project(path: ':pluto-plugins:plugins:logger:lib') - api project(path: ':pluto-plugins:plugins:datastore:lib') - api project(path: ':pluto-plugins:plugins:rooms-database:lib') - api project(path: ':pluto-plugins:plugins:layout-inspector:lib') -} \ No newline at end of file diff --git a/pluto-plugins/bundle/lib/build.gradle.kts b/pluto-plugins/bundle/lib/build.gradle.kts new file mode 100644 index 000000000..2097a15c9 --- /dev/null +++ b/pluto-plugins/bundle/lib/build.gradle.kts @@ -0,0 +1,66 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "bundle-core" +extra["PUBLISH_VERSION"] = verPublish + +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() + +// 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() + } +} + +dependencies { + api(project(":pluto-plugins:plugins:exceptions:lib")) + api(project(":pluto-plugins:plugins:network:core:lib")) + api(project(":pluto-plugins:plugins:network:interceptor-ktor:lib")) + api(project(":pluto-plugins:plugins:network:interceptor-okhttp:lib")) + api(project(":pluto-plugins:plugins:shared-preferences:lib")) + api(project(":pluto-plugins:plugins:logger:lib")) + api(project(":pluto-plugins:plugins:datastore:lib")) + api(project(":pluto-plugins:plugins:rooms-database:lib")) + api(project(":pluto-plugins:plugins:layout-inspector:lib")) +} From 464d33eab23ecd1bacffc7f0c621ba1586366fcc Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sat, 22 Feb 2025 17:58:48 +0530 Subject: [PATCH 04/11] datastore & exceptions - groovy to kotlin --- .../plugins/datastore/lib-no-op/build.gradle | 19 ----- .../datastore/lib-no-op/build.gradle.kts | 60 +++++++++++++++ .../plugins/datastore/lib/build.gradle | 37 --------- .../plugins/datastore/lib/build.gradle.kts | 76 +++++++++++++++++++ .../plugins/exceptions/lib-no-op/build.gradle | 18 ----- .../exceptions/lib-no-op/build.gradle.kts | 59 ++++++++++++++ .../plugins/exceptions/lib/build.gradle | 29 ------- .../plugins/exceptions/lib/build.gradle.kts | 74 ++++++++++++++++++ 8 files changed, 269 insertions(+), 103 deletions(-) delete mode 100644 pluto-plugins/plugins/datastore/lib-no-op/build.gradle create mode 100644 pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts delete mode 100644 pluto-plugins/plugins/datastore/lib/build.gradle create mode 100644 pluto-plugins/plugins/datastore/lib/build.gradle.kts delete mode 100644 pluto-plugins/plugins/exceptions/lib-no-op/build.gradle create mode 100644 pluto-plugins/plugins/exceptions/lib-no-op/build.gradle.kts delete mode 100644 pluto-plugins/plugins/exceptions/lib/build.gradle create mode 100644 pluto-plugins/plugins/exceptions/lib/build.gradle.kts diff --git a/pluto-plugins/plugins/datastore/lib-no-op/build.gradle b/pluto-plugins/plugins/datastore/lib-no-op/build.gradle deleted file mode 100644 index 6a5e6323a..000000000 --- a/pluto-plugins/plugins/datastore/lib-no-op/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'datastore-pref-no-op' -} - -android { - namespace 'com.pluto.plugins.datastore.pref' -} - -dependencies { - implementation(libs.androidx.core) - implementation(libs.datastore.preferences) -} \ No newline at end of file diff --git a/pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts new file mode 100644 index 000000000..702a5bfdb --- /dev/null +++ b/pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts @@ -0,0 +1,60 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "datastore-pref-no-op" +extra["PUBLISH_VERSION"] = verPublish + +android { + namespace = "com.pluto.plugins.datastore.pref" + + 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() + } +} + +dependencies { + implementation(libs.androidx.core) + implementation(libs.datastore.preferences) +} diff --git a/pluto-plugins/plugins/datastore/lib/build.gradle b/pluto-plugins/plugins/datastore/lib/build.gradle deleted file mode 100644 index 00e3e4158..000000000 --- a/pluto-plugins/plugins/datastore/lib/build.gradle +++ /dev/null @@ -1,37 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'datastore-pref' -} - -android { - buildFeatures { - compose true - } - - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() - } - - resourcePrefix 'pluto_dts___' - namespace 'com.pluto.plugins.datastore.pref' -} - -dependencies { - implementation project(path: ':pluto-plugins:base:lib') - implementation(libs.androidx.core) - implementation(libs.compose.material3) - implementation(libs.compose.foundation) - implementation(libs.compose.runtime) - implementation(libs.compose.ui) - implementation(libs.compose.ui.tooling) - implementation(libs.compose.ui.tooling.preview) - implementation(libs.constraintlayout.compose) - - implementation(libs.datastore.preferences) -} \ No newline at end of file diff --git a/pluto-plugins/plugins/datastore/lib/build.gradle.kts b/pluto-plugins/plugins/datastore/lib/build.gradle.kts new file mode 100644 index 000000000..bdbe9d835 --- /dev/null +++ b/pluto-plugins/plugins/datastore/lib/build.gradle.kts @@ -0,0 +1,76 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "datastore-pref" +extra["PUBLISH_VERSION"] = verPublish + +android { + namespace = "com.pluto.plugins.datastore.pref" + resourcePrefix = "pluto_dts___" + + composeOptions { + kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() + } + + compileSdk = libs.versions.compileSdk.get().toInt() + buildToolsVersion = libs.versions.buildTools.get() + + buildFeatures { + buildConfig = true + viewBinding = true + compose = 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() + } +} + +dependencies { + implementation(project(":pluto-plugins:base:lib")) + + implementation(libs.androidx.core) + implementation(libs.compose.material3) + implementation(libs.compose.foundation) + implementation(libs.compose.runtime) + implementation(libs.compose.ui) + implementation(libs.compose.ui.tooling) + implementation(libs.compose.ui.tooling.preview) + implementation(libs.constraintlayout.compose) + + implementation(libs.datastore.preferences) +} diff --git a/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle b/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle deleted file mode 100644 index d221df296..000000000 --- a/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'exceptions-no-op' -} - -android { - namespace 'com.pluto.plugins.exceptions' -} - -dependencies { - implementation(libs.androidx.core) -} \ No newline at end of file diff --git a/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle.kts new file mode 100644 index 000000000..8601a8ab6 --- /dev/null +++ b/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "exceptions-no-op" +extra["PUBLISH_VERSION"] = verPublish + +android { + namespace = "com.pluto.plugins.exceptions" + + 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() + } +} + +dependencies { + implementation(libs.androidx.core) +} diff --git a/pluto-plugins/plugins/exceptions/lib/build.gradle b/pluto-plugins/plugins/exceptions/lib/build.gradle deleted file mode 100644 index 794d499eb..000000000 --- a/pluto-plugins/plugins/exceptions/lib/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) - alias(libs.plugins.ksp) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'exceptions' -} - -android { - resourcePrefix 'pluto_excep___' - namespace 'com.pluto.plugins.exceptions' -} - -dependencies { -// implementation 'com.plutolib:plugin:2.0.0' - implementation project(path: ':pluto-plugins:base:lib') - implementation(libs.androidx.core) - - implementation(libs.moshi) - ksp(libs.moshi.codegen) - - implementation(libs.room) - ksp(libs.room.compiler) -} \ No newline at end of file diff --git a/pluto-plugins/plugins/exceptions/lib/build.gradle.kts b/pluto-plugins/plugins/exceptions/lib/build.gradle.kts new file mode 100644 index 000000000..3e7e36031 --- /dev/null +++ b/pluto-plugins/plugins/exceptions/lib/build.gradle.kts @@ -0,0 +1,74 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) + 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 + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "exceptions" +extra["PUBLISH_VERSION"] = verPublish + +android { + namespace = "com.pluto.plugins.exceptions" + resourcePrefix = "pluto_excep___" + + composeOptions { + kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() + } + + 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() + } +} + +dependencies { + implementation(project(":pluto-plugins:base:lib")) + + implementation(libs.androidx.core) + + implementation(libs.moshi) + ksp(libs.moshi.codegen) + + implementation(libs.room) + ksp(libs.room.compiler) +} From 57321e65d156646653965ffa721f1693ed7ee798 Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sat, 22 Feb 2025 18:06:47 +0530 Subject: [PATCH 05/11] layout inspector - groovy to kotlin --- .../layout-inspector/lib-no-op/build.gradle | 18 ------ .../lib-no-op/build.gradle.kts | 59 ++++++++++++++++++ .../plugins/layout-inspector/lib/build.gradle | 21 ------- .../layout-inspector/lib/build.gradle.kts | 62 +++++++++++++++++++ 4 files changed, 121 insertions(+), 39 deletions(-) delete mode 100644 pluto-plugins/plugins/layout-inspector/lib-no-op/build.gradle create mode 100644 pluto-plugins/plugins/layout-inspector/lib-no-op/build.gradle.kts delete mode 100644 pluto-plugins/plugins/layout-inspector/lib/build.gradle create mode 100644 pluto-plugins/plugins/layout-inspector/lib/build.gradle.kts diff --git a/pluto-plugins/plugins/layout-inspector/lib-no-op/build.gradle b/pluto-plugins/plugins/layout-inspector/lib-no-op/build.gradle deleted file mode 100644 index 7c5241d97..000000000 --- a/pluto-plugins/plugins/layout-inspector/lib-no-op/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'layout-inspector-no-op' -} - -android { - namespace 'com.pluto.plugins.layoutinspector' -} - -dependencies { - implementation(libs.androidx.core) -} \ No newline at end of file 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 new file mode 100644 index 000000000..5591a96cb --- /dev/null +++ b/pluto-plugins/plugins/layout-inspector/lib-no-op/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "layout-inspector-no-op" +extra["PUBLISH_VERSION"] = verPublish + +android { + namespace = "com.pluto.plugins.layoutinspector" + + 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() + } +} + +dependencies { + implementation(libs.androidx.core) +} diff --git a/pluto-plugins/plugins/layout-inspector/lib/build.gradle b/pluto-plugins/plugins/layout-inspector/lib/build.gradle deleted file mode 100644 index c6ea9f6ee..000000000 --- a/pluto-plugins/plugins/layout-inspector/lib/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'layout-inspector' -} - -android { - resourcePrefix 'pluto_li___' - namespace 'com.pluto.plugins.layoutinspector' -} - -dependencies { - implementation project(path: ':pluto-plugins:base:lib') - implementation(libs.androidx.core) -} \ No newline at end of file diff --git a/pluto-plugins/plugins/layout-inspector/lib/build.gradle.kts b/pluto-plugins/plugins/layout-inspector/lib/build.gradle.kts new file mode 100644 index 000000000..bb7783f17 --- /dev/null +++ b/pluto-plugins/plugins/layout-inspector/lib/build.gradle.kts @@ -0,0 +1,62 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "layout-inspector" +extra["PUBLISH_VERSION"] = verPublish + +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() + } +} + +dependencies { + implementation(project(":pluto-plugins:base:lib")) + + implementation(libs.androidx.core) +} From 2e5f6cb210df262ea01e051a95cc5639cdac9ebf Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sat, 22 Feb 2025 18:23:00 +0530 Subject: [PATCH 06/11] logger & rooms - groovy to kotlin --- build.gradle.kts | 2 +- maven-versions.gradle | 3 - maven-versions.gradle.kts | 1 + .../plugins/exceptions/lib/build.gradle.kts | 4 -- .../plugins/logger/lib-no-op/build.gradle | 19 ----- .../plugins/logger/lib-no-op/build.gradle.kts | 60 ++++++++++++++++ pluto-plugins/plugins/logger/lib/build.gradle | 34 --------- .../plugins/logger/lib/build.gradle.kts | 69 +++++++++++++++++++ .../rooms-database/lib-no-op/build.gradle | 18 ----- .../rooms-database/lib-no-op/build.gradle.kts | 59 ++++++++++++++++ .../plugins/rooms-database/lib/build.gradle | 27 -------- .../rooms-database/lib/build.gradle.kts | 68 ++++++++++++++++++ 12 files changed, 258 insertions(+), 106 deletions(-) delete mode 100644 maven-versions.gradle create mode 100644 maven-versions.gradle.kts delete mode 100644 pluto-plugins/plugins/logger/lib-no-op/build.gradle create mode 100644 pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts delete mode 100644 pluto-plugins/plugins/logger/lib/build.gradle create mode 100644 pluto-plugins/plugins/logger/lib/build.gradle.kts delete mode 100644 pluto-plugins/plugins/rooms-database/lib-no-op/build.gradle create mode 100644 pluto-plugins/plugins/rooms-database/lib-no-op/build.gradle.kts delete mode 100644 pluto-plugins/plugins/rooms-database/lib/build.gradle create mode 100644 pluto-plugins/plugins/rooms-database/lib/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index 19701d0c2..e92a24302 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,4 +52,4 @@ val prCheck by tasks.registering { } apply (from = "$rootDir/scripts/project-dependancy-graph.gradle") -apply (from = "$rootDir/maven-versions.gradle") \ No newline at end of file +apply (from = "$rootDir/maven-versions.gradle.kts") \ No newline at end of file diff --git a/maven-versions.gradle b/maven-versions.gradle deleted file mode 100644 index f1e9539c1..000000000 --- a/maven-versions.gradle +++ /dev/null @@ -1,3 +0,0 @@ -ext { - plutoVersion = '2.0.5' -} \ No newline at end of file diff --git a/maven-versions.gradle.kts b/maven-versions.gradle.kts new file mode 100644 index 000000000..e4317b9b7 --- /dev/null +++ b/maven-versions.gradle.kts @@ -0,0 +1 @@ +extra["plutoVersion"] = "2.0.5" \ No newline at end of file diff --git a/pluto-plugins/plugins/exceptions/lib/build.gradle.kts b/pluto-plugins/plugins/exceptions/lib/build.gradle.kts index 3e7e36031..92e027e78 100644 --- a/pluto-plugins/plugins/exceptions/lib/build.gradle.kts +++ b/pluto-plugins/plugins/exceptions/lib/build.gradle.kts @@ -18,10 +18,6 @@ android { namespace = "com.pluto.plugins.exceptions" resourcePrefix = "pluto_excep___" - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() - } - compileSdk = libs.versions.compileSdk.get().toInt() buildToolsVersion = libs.versions.buildTools.get() diff --git a/pluto-plugins/plugins/logger/lib-no-op/build.gradle b/pluto-plugins/plugins/logger/lib-no-op/build.gradle deleted file mode 100644 index 8b27d64aa..000000000 --- a/pluto-plugins/plugins/logger/lib-no-op/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'logger-no-op' -} - -android { - namespace 'com.pluto.plugins.logger' -} - -dependencies { - implementation(libs.androidx.core) - api 'com.jakewharton.timber:timber:5.0.1' -} \ No newline at end of file diff --git a/pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts new file mode 100644 index 000000000..c541b9f33 --- /dev/null +++ b/pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts @@ -0,0 +1,60 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "logger-no-op" +extra["PUBLISH_VERSION"] = verPublish + +android { + 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() + } +} + +dependencies { + implementation(libs.androidx.core) + api(libs.timber) +} diff --git a/pluto-plugins/plugins/logger/lib/build.gradle b/pluto-plugins/plugins/logger/lib/build.gradle deleted file mode 100644 index 6cf576a34..000000000 --- a/pluto-plugins/plugins/logger/lib/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) - alias(libs.plugins.ksp) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'logger' -} - -android { - resourcePrefix 'pluto_logger___' - namespace 'com.pluto.plugins.logger' -} - -dependencies { -// implementation 'com.plutolib:plugin:2.0.0' - implementation project(path: ':pluto-plugins:base:lib') - implementation(libs.androidx.navigation.ui) - api(libs.timber) - implementation(libs.moshi) - ksp(libs.moshi.codegen) - - implementation(libs.room) - ksp(libs.room.compiler) -} - -task validateChanges { - dependsOn 'ktlintFormat' - dependsOn 'detekt' -} \ No newline at end of file diff --git a/pluto-plugins/plugins/logger/lib/build.gradle.kts b/pluto-plugins/plugins/logger/lib/build.gradle.kts new file mode 100644 index 000000000..be63dbee4 --- /dev/null +++ b/pluto-plugins/plugins/logger/lib/build.gradle.kts @@ -0,0 +1,69 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) + 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 + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "logger" +extra["PUBLISH_VERSION"] = verPublish + +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() + } +} + +dependencies { + implementation(project(":pluto-plugins:base:lib")) + implementation(libs.androidx.navigation.ui) + api(libs.timber) + implementation(libs.moshi) + ksp(libs.moshi.codegen) + + implementation(libs.room) + ksp(libs.room.compiler) +} diff --git a/pluto-plugins/plugins/rooms-database/lib-no-op/build.gradle b/pluto-plugins/plugins/rooms-database/lib-no-op/build.gradle deleted file mode 100644 index 34e5bc452..000000000 --- a/pluto-plugins/plugins/rooms-database/lib-no-op/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'rooms-db-no-op' -} - -android { - namespace 'com.pluto.plugins.rooms.db' -} - -dependencies { - implementation(libs.androidx.core) -} \ No newline at end of file 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 new file mode 100644 index 000000000..45794c72a --- /dev/null +++ b/pluto-plugins/plugins/rooms-database/lib-no-op/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "rooms-db-no-op" +extra["PUBLISH_VERSION"] = verPublish + +android { + 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() + } +} + +dependencies { + implementation(libs.androidx.core) +} diff --git a/pluto-plugins/plugins/rooms-database/lib/build.gradle b/pluto-plugins/plugins/rooms-database/lib/build.gradle deleted file mode 100644 index cfe9023d3..000000000 --- a/pluto-plugins/plugins/rooms-database/lib/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) - alias(libs.plugins.ksp) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'rooms-db' -} - -android { - resourcePrefix 'pluto_rooms___' - namespace 'com.pluto.plugins.rooms.db' -} - -dependencies { -// implementation 'com.plutolib:plugin:2.0.0' - implementation project(path: ':pluto-plugins:base:lib') - implementation(libs.androidx.core) - implementation(libs.androidx.swiperefreshlayout) - - implementation(libs.room) - ksp(libs.room.compiler) -} \ No newline at end of file diff --git a/pluto-plugins/plugins/rooms-database/lib/build.gradle.kts b/pluto-plugins/plugins/rooms-database/lib/build.gradle.kts new file mode 100644 index 000000000..65ec78605 --- /dev/null +++ b/pluto-plugins/plugins/rooms-database/lib/build.gradle.kts @@ -0,0 +1,68 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) + 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 + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "rooms-db" +extra["PUBLISH_VERSION"] = verPublish + +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() + } +} + +dependencies { + implementation(project(":pluto-plugins:base:lib")) + + implementation(libs.androidx.core) + implementation(libs.androidx.swiperefreshlayout) + + implementation(libs.room) + ksp(libs.room.compiler) +} From 37530f8387b7c4ae7318d683ccd76a3320f7f69c Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sat, 22 Feb 2025 18:44:18 +0530 Subject: [PATCH 07/11] network & share pref - groovy to kotlin --- .../network/core/lib-no-op/build.gradle | 17 ----- .../network/core/lib-no-op/build.gradle.kts | 58 ++++++++++++++ .../plugins/network/core/lib/build.gradle | 35 --------- .../plugins/network/core/lib/build.gradle.kts | 76 +++++++++++++++++++ .../shared-preferences/lib-no-op/build.gradle | 18 ----- .../lib-no-op/build.gradle.kts | 59 ++++++++++++++ .../shared-preferences/lib/build.gradle | 34 --------- .../shared-preferences/lib/build.gradle.kts | 70 +++++++++++++++++ 8 files changed, 263 insertions(+), 104 deletions(-) delete mode 100644 pluto-plugins/plugins/network/core/lib-no-op/build.gradle create mode 100644 pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts delete mode 100644 pluto-plugins/plugins/network/core/lib/build.gradle create mode 100644 pluto-plugins/plugins/network/core/lib/build.gradle.kts delete mode 100644 pluto-plugins/plugins/shared-preferences/lib-no-op/build.gradle create mode 100644 pluto-plugins/plugins/shared-preferences/lib-no-op/build.gradle.kts delete mode 100644 pluto-plugins/plugins/shared-preferences/lib/build.gradle create mode 100644 pluto-plugins/plugins/shared-preferences/lib/build.gradle.kts diff --git a/pluto-plugins/plugins/network/core/lib-no-op/build.gradle b/pluto-plugins/plugins/network/core/lib-no-op/build.gradle deleted file mode 100644 index 753a183e7..000000000 --- a/pluto-plugins/plugins/network/core/lib-no-op/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'network-no-op' -} - -android { - namespace 'com.pluto.plugins.network' -} - -dependencies { -} \ No newline at end of file diff --git a/pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts new file mode 100644 index 000000000..3ea0e16cf --- /dev/null +++ b/pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts @@ -0,0 +1,58 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "network-no-op" +extra["PUBLISH_VERSION"] = verPublish + +android { + 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() + } +} + +dependencies { +} diff --git a/pluto-plugins/plugins/network/core/lib/build.gradle b/pluto-plugins/plugins/network/core/lib/build.gradle deleted file mode 100644 index 6177851b0..000000000 --- a/pluto-plugins/plugins/network/core/lib/build.gradle +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) - alias(libs.plugins.ksp) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'network' -} - -android { - resourcePrefix 'pluto_network___' - namespace 'com.pluto.plugins.network' -} - -dependencies { -// implementation 'com.plutolib:plugin:2.0.0' - implementation project(path: ':pluto-plugins:base:lib') - implementation(libs.androidx.core) - - implementation(libs.okio) - implementation(libs.ktor.client.core.jvm) - - implementation(libs.room) - ksp(libs.room.compiler) - - implementation(libs.moshi) - ksp(libs.moshi.codegen) - - implementation(libs.androidx.browser) - testImplementation(libs.junit) -} \ No newline at end of file diff --git a/pluto-plugins/plugins/network/core/lib/build.gradle.kts b/pluto-plugins/plugins/network/core/lib/build.gradle.kts new file mode 100644 index 000000000..38e275401 --- /dev/null +++ b/pluto-plugins/plugins/network/core/lib/build.gradle.kts @@ -0,0 +1,76 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) + 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 + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "network" +extra["PUBLISH_VERSION"] = verPublish + +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() + } +} + +dependencies { +// implementation 'com.plutolib:plugin:2.0.0' + implementation(project(":pluto-plugins:base:lib")) + implementation(libs.androidx.core) + + implementation(libs.okio) + implementation(libs.ktor.client.core.jvm) + + implementation(libs.room) + ksp(libs.room.compiler) + + implementation(libs.moshi) + ksp(libs.moshi.codegen) + + implementation(libs.androidx.browser) + testImplementation(libs.junit) +} diff --git a/pluto-plugins/plugins/shared-preferences/lib-no-op/build.gradle b/pluto-plugins/plugins/shared-preferences/lib-no-op/build.gradle deleted file mode 100644 index dcef3dcba..000000000 --- a/pluto-plugins/plugins/shared-preferences/lib-no-op/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'preferences-no-op' -} - -android { - namespace 'com.pluto.plugins.preferences' -} - -dependencies { - implementation(libs.androidx.core) -} \ No newline at end of file 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 new file mode 100644 index 000000000..6d1dca0d4 --- /dev/null +++ b/pluto-plugins/plugins/shared-preferences/lib-no-op/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "preferences-no-op" +extra["PUBLISH_VERSION"] = verPublish + +android { + 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() + } +} + +dependencies { + implementation(libs.androidx.core) +} diff --git a/pluto-plugins/plugins/shared-preferences/lib/build.gradle b/pluto-plugins/plugins/shared-preferences/lib/build.gradle deleted file mode 100644 index 1cb10acd8..000000000 --- a/pluto-plugins/plugins/shared-preferences/lib/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.ksp) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'preferences' -} - -android { - resourcePrefix 'pluto_pref___' - namespace 'com.pluto.plugins.preferences' -} - -dependencies { -// implementation 'com.plutolib:plugin:2.0.0' - implementation project(path: ':pluto-plugins:base:lib') - implementation(libs.androidx.core) - implementation(libs.androidx.navigation.ui) - implementation(libs.google.material) - implementation(libs.androidx.navigation.fragment) - implementation(libs.androidx.preference) - - implementation(libs.moshi) - ksp(libs.moshi.codegen) -} - -task validateChanges { - dependsOn 'ktlintFormat' - dependsOn 'detekt' -} \ No newline at end of file diff --git a/pluto-plugins/plugins/shared-preferences/lib/build.gradle.kts b/pluto-plugins/plugins/shared-preferences/lib/build.gradle.kts new file mode 100644 index 000000000..c83b54e45 --- /dev/null +++ b/pluto-plugins/plugins/shared-preferences/lib/build.gradle.kts @@ -0,0 +1,70 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + 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 + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "preferences" +extra["PUBLISH_VERSION"] = verPublish + +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() + } +} + +dependencies { +// implementation 'com.plutolib:plugin:2.0.0' + implementation(project(":pluto-plugins:base:lib")) + implementation(libs.androidx.core) + implementation(libs.androidx.navigation.ui) + implementation(libs.google.material) + implementation(libs.androidx.navigation.fragment) + implementation(libs.androidx.preference) + + implementation(libs.moshi) + ksp(libs.moshi.codegen) +} From 5f446400fea8145d35f62faab180212cb7acb075 Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sat, 22 Feb 2025 19:11:05 +0530 Subject: [PATCH 08/11] network interceptor - groovy to kotlin --- .../interceptor-ktor/lib-no-op/build.gradle | 19 ----- .../lib-no-op/build.gradle.kts | 59 +++++++++++++++ .../network/interceptor-ktor/lib/build.gradle | 25 ------- .../interceptor-ktor/lib/build.gradle.kts | 64 +++++++++++++++++ .../interceptor-okhttp/lib-no-op/build.gradle | 19 ----- .../lib-no-op/build.gradle.kts | 60 ++++++++++++++++ .../interceptor-okhttp/lib/build.gradle | 25 ------- .../interceptor-okhttp/lib/build.gradle.kts | 71 +++++++++++++++++++ 8 files changed, 254 insertions(+), 88 deletions(-) delete mode 100644 pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle create mode 100644 pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts delete mode 100644 pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle create mode 100644 pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle.kts delete mode 100644 pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle create mode 100644 pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts delete mode 100644 pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle create mode 100644 pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle b/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle deleted file mode 100644 index 06547b673..000000000 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'network-interceptor-ktor-no-op' -} - -android { - namespace 'com.pluto.plugins.network.ktor' -} - -dependencies { - implementation(libs.ktor.client.core.jvm) - -} \ No newline at end of file diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts new file mode 100644 index 000000000..f1ed86837 --- /dev/null +++ b/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "network-interceptor-ktor-no-op" +extra["PUBLISH_VERSION"] = verPublish + +android { + namespace = "com.pluto.plugins.network.ktor" + + 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() + } +} + +dependencies { + implementation(libs.ktor.client.core.jvm) +} diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle b/pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle deleted file mode 100644 index 21b36648e..000000000 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) - alias(libs.plugins.ksp) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = "network-interceptor-ktor" -} - -android { - resourcePrefix 'pluto_network___' - namespace 'com.pluto.plugins.network.ktor' -} - -dependencies { -// implementation 'com.plutolib:plugin:2.0.0' -// implementation project(':pluto-plugins:base:lib') - implementation project(':pluto-plugins:plugins:network:core:lib') - - implementation(libs.ktor.client.core.jvm) -} \ No newline at end of file diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle.kts new file mode 100644 index 000000000..6a3c7dda2 --- /dev/null +++ b/pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle.kts @@ -0,0 +1,64 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) + 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 + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "network-interceptor-ktor" +extra["PUBLISH_VERSION"] = verPublish + +android { + resourcePrefix = "pluto_network___" + namespace = "com.pluto.plugins.network.ktor" + + 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() + } +} + +dependencies { + implementation(project(":pluto-plugins:plugins:network:core:lib")) + + implementation(libs.ktor.client.core.jvm) +} diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle b/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle deleted file mode 100644 index 5648eec72..000000000 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = 'network-interceptor-okhttp-no-op' -} - -android { - namespace 'com.pluto.plugins.network.okhttp' -} - -dependencies { - implementation(libs.androidx.core) - implementation(libs.okhttp) -} \ No newline at end of file diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts new file mode 100644 index 000000000..ed899c033 --- /dev/null +++ b/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts @@ -0,0 +1,60 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +val version = Versioning.loadVersioningData() +val verCode = version["code"] as Int +val verPublish = version["publish"] as String +val verGitSHA = version["gitSha"] as String + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "network-interceptor-okhttp-no-op" +extra["PUBLISH_VERSION"] = verPublish + +android { + namespace = "com.pluto.plugins.network.okhttp" + + 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() + } +} + +dependencies { +// implementation(libs.androidx.core) + implementation(libs.okhttp) +} diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle b/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle deleted file mode 100644 index 1f9aad5ac..000000000 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) - alias(libs.plugins.ksp) -} -apply from: "$rootDir/scripts/pluginBuilder.gradle" - -ext { - PUBLISH_GROUP_ID = "com.plutolib.plugins" - PUBLISH_ARTIFACT_ID = "network-interceptor-okhttp" -} - -android { - resourcePrefix 'pluto_network___' - namespace 'com.pluto.plugins.network.okhttp' -} - -dependencies { -// implementation 'com.plutolib:plugin:2.0.0' - implementation project(':pluto-plugins:base:lib') - implementation project(':pluto-plugins:plugins:network:core:lib') - - implementation(libs.okhttp) -} diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts new file mode 100644 index 000000000..8b59395e0 --- /dev/null +++ b/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts @@ -0,0 +1,71 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +// alias(libs.plugins.kotlin.parcelize) +// 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 + +extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" +extra["PUBLISH_ARTIFACT_ID"] = "network-interceptor-okhttp" +extra["PUBLISH_VERSION"] = verPublish + +// ext { +// PUBLISH_GROUP_ID = "com.plutolib.plugins" +// PUBLISH_ARTIFACT_ID = "network-interceptor-okhttp" +// } + +android { + resourcePrefix = "pluto_network___" + namespace = "com.pluto.plugins.network.okhttp" + + 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() + } +} + +dependencies { +// implementation 'com.plutolib:plugin:2.0.0' + implementation(project(":pluto-plugins:base:lib")) + implementation(project(":pluto-plugins:plugins:network:core:lib")) + + implementation(libs.okhttp) +} From 9518de2c06545a027d1aead71a0962f60e26dcee Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sat, 22 Feb 2025 19:20:15 +0530 Subject: [PATCH 09/11] deleted redundant files --- scripts/pluginBuilder.gradle | 53 ------------------------------------ scripts/version.gradle | 22 --------------- 2 files changed, 75 deletions(-) delete mode 100644 scripts/pluginBuilder.gradle delete mode 100644 scripts/version.gradle diff --git a/scripts/pluginBuilder.gradle b/scripts/pluginBuilder.gradle deleted file mode 100644 index 947a31a69..000000000 --- a/scripts/pluginBuilder.gradle +++ /dev/null @@ -1,53 +0,0 @@ -apply from: "$rootDir/scripts/version.gradle" -//apply from: "$rootDir/scripts/publish/publish.gradle" - - -def version = loadVersioningData() -def verCode = version["code"] -def verPublish = version["publish"] -def verGitSHA = version["gitSha"] - -ext { - PUBLISH_VERSION = verPublish -} - -android { - compileSdk = libs.versions.compileSdk.get().toInteger() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig true - viewBinding true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInteger() - targetSdk = libs.versions.targetSdk.get().toInteger() - - buildConfigField ("String", "VERSION_NAME", "\"${verPublish}\"") - buildConfigField ("long", "VERSION_CODE", "${verCode}") - buildConfigField ("String", "GIT_SHA", "\"${verGitSHA}\"") - } - - buildTypes { - release { - debuggable true - minifyEnabled false - shrinkResources false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() -// freeCompilerArgs += listOf("-module-name", project.name) - } - - lint { - abortOnError false - } -} \ No newline at end of file diff --git a/scripts/version.gradle b/scripts/version.gradle deleted file mode 100644 index 62a6817f7..000000000 --- a/scripts/version.gradle +++ /dev/null @@ -1,22 +0,0 @@ -ext.loadVersioningData = { - def version = [:] - - Properties versionProps = new Properties() - versionProps.load(new FileInputStream(file("$project.rootDir/version.properties"))) - - def versionMajor = versionProps['major'].toInteger() - def versionMinor = versionProps['minor'].toInteger() - def versionPatch = versionProps['patch'].toInteger() - def versionBuild = versionProps['build'].toInteger() - def versionChannel = versionProps['channel'] - - version["code"] = (versionMajor * 1000000) + (versionMinor * 10000) + (versionPatch * 100) + versionBuild - version["name"] = "${versionMajor}.${versionMinor}.${versionPatch}-rc${versionBuild}" - version["publish"] = "${versionMajor}.${versionMinor}.${versionPatch}" - if (versionChannel != "release") { - version["publish"] = "${verPublish}-${versionChannel}${versionBuild}" - } - version["gitSha"] = 'git rev-parse --short=10 HEAD'.execute().text.trim() - - return version -} From bc9c8519ca366cba141f958a8e2ae9fe623406f2 Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sat, 22 Feb 2025 23:02:13 +0530 Subject: [PATCH 10/11] refactor --- sample/build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index fda43693f..de252171a 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -81,16 +81,16 @@ android { dependencies { /* Local Op dependencies */ - "debugImplementation"(project(mapOf("path" to ":pluto:lib"))) - "debugImplementation"(project(mapOf("path" to ":pluto-plugins:bundle:lib"))) + "debugImplementation"(project(":pluto:lib")) + "debugImplementation"(project(":pluto-plugins:bundle:lib")) /* Maven Op dependencies */ "debugMavenImplementation"("com.plutolib:pluto:$verPublish") "debugMavenImplementation"("com.plutolib.plugins:bundle-core:$verPublish") /* Local NoOp dependencies */ - "debugNoOpImplementation"(project(mapOf("path" to ":pluto:lib-no-op"))) - "debugNoOpImplementation"(project(mapOf("path" to ":pluto-plugins:bundle:lib-no-op"))) + "debugNoOpImplementation"(project(":pluto:lib-no-op")) + "debugNoOpImplementation"(project(":pluto-plugins:bundle:lib-no-op")) /* Maven NoOp dependencies */ "debugNoOpMavenImplementation"("com.plutolib:pluto-no-op:$verPublish") From 98cfb8c8109b48a7f707d8bdf4fdded30a66ba9a Mon Sep 17 00:00:00 2001 From: srtvprateek Date: Sun, 23 Feb 2025 00:35:36 +0530 Subject: [PATCH 11/11] cleanup --- pluto-plugins/bundle/lib-no-op/build.gradle.kts | 4 ---- pluto-plugins/bundle/lib/build.gradle.kts | 4 ---- pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts | 5 ----- .../plugins/exceptions/lib-no-op/build.gradle.kts | 5 ----- .../plugins/layout-inspector/lib-no-op/build.gradle.kts | 5 ----- pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts | 5 ----- .../plugins/network/core/lib-no-op/build.gradle.kts | 5 ----- .../network/interceptor-ktor/lib-no-op/build.gradle.kts | 5 ----- .../network/interceptor-okhttp/lib-no-op/build.gradle.kts | 5 ----- .../network/interceptor-okhttp/lib/build.gradle.kts | 7 ------- .../plugins/rooms-database/lib-no-op/build.gradle.kts | 5 ----- .../plugins/shared-preferences/lib-no-op/build.gradle.kts | 5 ----- pluto/lib-no-op/build.gradle.kts | 1 - sample/build.gradle.kts | 4 +--- 14 files changed, 1 insertion(+), 64 deletions(-) diff --git a/pluto-plugins/bundle/lib-no-op/build.gradle.kts b/pluto-plugins/bundle/lib-no-op/build.gradle.kts index f038ad0db..e84c910b5 100644 --- a/pluto-plugins/bundle/lib-no-op/build.gradle.kts +++ b/pluto-plugins/bundle/lib-no-op/build.gradle.kts @@ -24,10 +24,6 @@ android { defaultConfig { minSdk = libs.versions.minSdk.get().toInt() - -// buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") -// buildConfigField("long", "VERSION_CODE", "$verCode") -// buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") } buildTypes { diff --git a/pluto-plugins/bundle/lib/build.gradle.kts b/pluto-plugins/bundle/lib/build.gradle.kts index 2097a15c9..402483e22 100644 --- a/pluto-plugins/bundle/lib/build.gradle.kts +++ b/pluto-plugins/bundle/lib/build.gradle.kts @@ -24,10 +24,6 @@ android { defaultConfig { minSdk = libs.versions.minSdk.get().toInt() - -// buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") -// buildConfigField("long", "VERSION_CODE", "$verCode") -// buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") } buildTypes { 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 702a5bfdb..e4f7c691c 100644 --- a/pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/datastore/lib-no-op/build.gradle.kts @@ -19,16 +19,11 @@ android { 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 { 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 8601a8ab6..3aff03962 100644 --- a/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/exceptions/lib-no-op/build.gradle.kts @@ -19,16 +19,11 @@ android { 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 { 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 5591a96cb..d4b875627 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 @@ -19,16 +19,11 @@ android { 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 { 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 c541b9f33..0d4f6b669 100644 --- a/pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/logger/lib-no-op/build.gradle.kts @@ -19,16 +19,11 @@ android { 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 { diff --git a/pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts index 3ea0e16cf..65bf966fe 100644 --- a/pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts @@ -19,16 +19,11 @@ android { 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 { diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts index f1ed86837..a21e7c33d 100644 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts @@ -19,16 +19,11 @@ android { 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 { diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts index ed899c033..13ed9dfe4 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts @@ -19,16 +19,11 @@ android { 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 { diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts index 8b59395e0..fbac6bfbf 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts +++ b/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts @@ -1,8 +1,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) -// alias(libs.plugins.kotlin.parcelize) -// alias(libs.plugins.ksp) } val version = Versioning.loadVersioningData() @@ -14,11 +12,6 @@ extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins" extra["PUBLISH_ARTIFACT_ID"] = "network-interceptor-okhttp" extra["PUBLISH_VERSION"] = verPublish -// ext { -// PUBLISH_GROUP_ID = "com.plutolib.plugins" -// PUBLISH_ARTIFACT_ID = "network-interceptor-okhttp" -// } - android { resourcePrefix = "pluto_network___" namespace = "com.pluto.plugins.network.okhttp" 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 45794c72a..da58617ba 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 @@ -19,16 +19,11 @@ android { 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 { 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 6d1dca0d4..b4b596473 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 @@ -19,16 +19,11 @@ android { 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 { diff --git a/pluto/lib-no-op/build.gradle.kts b/pluto/lib-no-op/build.gradle.kts index c091d6e23..3e2454a61 100644 --- a/pluto/lib-no-op/build.gradle.kts +++ b/pluto/lib-no-op/build.gradle.kts @@ -14,7 +14,6 @@ extra["PUBLISH_VERSION"] = verPublish android { namespace = "com.pluto" -// configureAndroid() compileSdk = libs.versions.compileSdk.get().toInt() buildToolsVersion = libs.versions.buildTools.get() diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index de252171a..882a75353 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -1,5 +1,3 @@ -import Versioning.loadVersioningData - plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) @@ -8,7 +6,7 @@ plugins { alias(libs.plugins.kotlin.serialization) } -val version = loadVersioningData() +val version = Versioning.loadVersioningData() val verCode = version["code"] as Int val verPublish = version["publish"] as String