Skip to content

Commit 5a71d2c

Browse files
srtvprateeksrtvprateek
committed
chore: migration gradle scripts to kotlin dsl from groovy (#339)
* migrated sample app build to kotlin * pluto - groovy to kotlin * plugins - groovy to kotlin * datastore & exceptions - groovy to kotlin * layout inspector - groovy to kotlin * logger & rooms - groovy to kotlin * network & share pref - groovy to kotlin * network interceptor - groovy to kotlin * deleted redundant files * refactor * cleanup
1 parent d641f73 commit 5a71d2c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+496
-1418
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@
88
.cxx
99
/.idea/*
1010
/scripts/publish/_credentials.properties
11+
/scripts/publish/_newCreds.properties
12+
*.gpg
13+
/buildSrc/build

‎build.gradle‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,4 @@ val prCheck by tasks.registering {
5252
}
5353

5454
apply (from = "$rootDir/scripts/project-dependancy-graph.gradle")
55-
apply (from = "$rootDir/maven-versions.gradle.kts")
56-
apply(from = "$rootDir/publishTasks.gradle.kts")
55+
apply (from = "$rootDir/maven-versions.gradle.kts")

‎pluto-plugins/base/lib/build.gradle‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎pluto-plugins/base/lib/build.gradle.kts‎

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import com.vanniktech.maven.publish.SonatypeHost
2-
31
plugins {
42
alias(libs.plugins.android.library)
53
alias(libs.plugins.kotlin.android)
6-
alias(libs.plugins.maven.publish)
74
}
85

96
val version = Versioning.loadVersioningData()
107
val verCode = version["code"] as Int
118
val verPublish = version["publish"] as String
129
val verGitSHA = version["gitSha"] as String
1310

11+
extra["PUBLISH_GROUP_ID"] = "com.plutolib"
12+
extra["PUBLISH_ARTIFACT_ID"] = "plugin"
13+
extra["PUBLISH_VERSION"] = verPublish
14+
1415
android {
1516
namespace = "com.pluto.plugin"
1617
resourcePrefix = "pluto___"
@@ -53,45 +54,6 @@ android {
5354
}
5455
}
5556

56-
extra["PUBLISH_GROUP_ID"] = "com.androidpluto"
57-
extra["PUBLISH_ARTIFACT_ID"] = "plugin"
58-
extra["PUBLISH_ARTIFACT_NAME"] = "Android Pluto Base Plugin Module"
59-
extra["PUBLISH_ARTIFACT_DESCRIPTION"] = "Open Sourced, on-device debugger for Android apps"
60-
61-
mavenPublishing {
62-
coordinates(
63-
groupId = extra["PUBLISH_GROUP_ID"] as String,
64-
artifactId = extra["PUBLISH_ARTIFACT_ID"] as String,
65-
version = verPublish
66-
)
67-
pom {
68-
name.set(extra["PUBLISH_ARTIFACT_NAME"] as String)
69-
description.set(extra["PUBLISH_ARTIFACT_DESCRIPTION"] as String)
70-
inceptionYear.set(project.findProperty("pom.inceptionYear") as? String)
71-
url.set(project.findProperty("pom.url") as? String)
72-
licenses {
73-
license {
74-
name.set(project.findProperty("pom.license.name") as? String)
75-
url.set(project.findProperty("pom.license.url") as? String)
76-
}
77-
}
78-
developers {
79-
developer {
80-
id.set(project.findProperty("pom.developer.id") as? String)
81-
name.set(project.findProperty("pom.developer.name") as? String)
82-
email.set(project.findProperty("pom.developer.email") as? String)
83-
}
84-
}
85-
scm {
86-
connection.set(project.findProperty("pom.scm.connection") as? String)
87-
developerConnection.set(project.findProperty("pom.scm.developerConnection") as? String)
88-
url.set(project.findProperty("pom.scm.url") as? String)
89-
}
90-
}
91-
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
92-
signAllPublications()
93-
}
94-
9557
dependencies {
9658
implementation(libs.androidx.core)
9759
implementation(libs.androidx.appcompat)

‎pluto-plugins/bundle/lib-no-op/build.gradle‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎pluto-plugins/bundle/lib-no-op/build.gradle.kts‎

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import com.vanniktech.maven.publish.SonatypeHost
2-
31
plugins {
42
alias(libs.plugins.android.library)
53
alias(libs.plugins.kotlin.android)
6-
alias(libs.plugins.maven.publish)
74
}
85

96
val version = Versioning.loadVersioningData()
107
val verCode = version["code"] as Int
118
val verPublish = version["publish"] as String
129
val verGitSHA = version["gitSha"] as String
1310

11+
extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins"
12+
extra["PUBLISH_ARTIFACT_ID"] = "bundle-core-no-op"
13+
extra["PUBLISH_VERSION"] = verPublish
14+
1415
android {
1516
namespace = "com.pluto.plugins.bundle.core"
1617
compileSdk = libs.versions.compileSdk.get().toInt()
@@ -48,48 +49,11 @@ android {
4849
}
4950
}
5051

51-
extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins"
52-
extra["PUBLISH_ARTIFACT_ID"] = "bundle-core-no-op"
53-
extra["PUBLISH_ARTIFACT_NAME"] = "Android Pluto Plugin Bundle"
54-
extra["PUBLISH_ARTIFACT_DESCRIPTION"] = "Bundle module for Android Pluto plugins"
55-
56-
mavenPublishing {
57-
coordinates(
58-
groupId = extra["PUBLISH_GROUP_ID"] as String,
59-
artifactId = extra["PUBLISH_ARTIFACT_ID"] as String,
60-
version = verPublish
61-
)
62-
pom {
63-
name.set(extra["PUBLISH_ARTIFACT_NAME"] as String)
64-
description.set(extra["PUBLISH_ARTIFACT_DESCRIPTION"] as String)
65-
inceptionYear.set(project.findProperty("pom.inceptionYear") as? String)
66-
url.set(project.findProperty("pom.url") as? String)
67-
licenses {
68-
license {
69-
name.set(project.findProperty("pom.license.name") as? String)
70-
url.set(project.findProperty("pom.license.url") as? String)
71-
}
72-
}
73-
developers {
74-
developer {
75-
id.set(project.findProperty("pom.developer.id") as? String)
76-
name.set(project.findProperty("pom.developer.name") as? String)
77-
email.set(project.findProperty("pom.developer.email") as? String)
78-
}
79-
}
80-
scm {
81-
connection.set(project.findProperty("pom.scm.connection") as? String)
82-
developerConnection.set(project.findProperty("pom.scm.developerConnection") as? String)
83-
url.set(project.findProperty("pom.scm.url") as? String)
84-
}
85-
}
86-
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
87-
signAllPublications()
88-
}
89-
9052
dependencies {
9153
api(project(":pluto-plugins:plugins:exceptions:lib-no-op"))
92-
api(project(":pluto-plugins:plugins:network:lib-no-op"))
54+
api(project(":pluto-plugins:plugins:network:core:lib-no-op"))
55+
api(project(":pluto-plugins:plugins:network:interceptor-ktor:lib-no-op"))
56+
api(project(":pluto-plugins:plugins:network:interceptor-okhttp:lib-no-op"))
9357
api(project(":pluto-plugins:plugins:shared-preferences:lib-no-op"))
9458
api(project(":pluto-plugins:plugins:logger:lib-no-op"))
9559
api(project(":pluto-plugins:plugins:datastore:lib-no-op"))

‎pluto-plugins/bundle/lib/build.gradle‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎pluto-plugins/bundle/lib/build.gradle.kts‎

Lines changed: 7 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import com.vanniktech.maven.publish.SonatypeHost
2-
31
plugins {
42
alias(libs.plugins.android.library)
53
alias(libs.plugins.kotlin.android)
6-
alias(libs.plugins.maven.publish)
74
}
85

96
val version = Versioning.loadVersioningData()
107
val verCode = version["code"] as Int
118
val verPublish = version["publish"] as String
129
val verGitSHA = version["gitSha"] as String
1310

11+
extra["PUBLISH_GROUP_ID"] = "com.plutolib.plugins"
12+
extra["PUBLISH_ARTIFACT_ID"] = "bundle-core"
13+
extra["PUBLISH_VERSION"] = verPublish
14+
1415
android {
1516
namespace = "com.pluto.plugins.bundle.core"
1617
compileSdk = libs.versions.compileSdk.get().toInt()
@@ -48,50 +49,11 @@ android {
4849
}
4950
}
5051

51-
extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins"
52-
extra["PUBLISH_ARTIFACT_ID"] = "bundle-core"
53-
extra["PUBLISH_ARTIFACT_NAME"] = "Android Pluto Plugin Bundle"
54-
extra["PUBLISH_ARTIFACT_DESCRIPTION"] = "Bundle module for Android Pluto plugins"
55-
56-
mavenPublishing {
57-
coordinates(
58-
groupId = extra["PUBLISH_GROUP_ID"] as String,
59-
artifactId = extra["PUBLISH_ARTIFACT_ID"] as String,
60-
version = verPublish
61-
)
62-
pom {
63-
name.set(extra["PUBLISH_ARTIFACT_NAME"] as String)
64-
description.set(extra["PUBLISH_ARTIFACT_DESCRIPTION"] as String)
65-
inceptionYear.set(project.findProperty("pom.inceptionYear") as? String)
66-
url.set(project.findProperty("pom.url") as? String)
67-
licenses {
68-
license {
69-
name.set(project.findProperty("pom.license.name") as? String)
70-
url.set(project.findProperty("pom.license.url") as? String)
71-
}
72-
}
73-
developers {
74-
developer {
75-
id.set(project.findProperty("pom.developer.id") as? String)
76-
name.set(project.findProperty("pom.developer.name") as? String)
77-
email.set(project.findProperty("pom.developer.email") as? String)
78-
}
79-
}
80-
scm {
81-
connection.set(project.findProperty("pom.scm.connection") as? String)
82-
developerConnection.set(project.findProperty("pom.scm.developerConnection") as? String)
83-
url.set(project.findProperty("pom.scm.url") as? String)
84-
}
85-
}
86-
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
87-
signAllPublications()
88-
}
89-
9052
dependencies {
9153
api(project(":pluto-plugins:plugins:exceptions:lib"))
92-
api(project(":pluto-plugins:plugins:network:lib"))
93-
// api(project(":pluto-plugins:plugins:network:interceptor-ktor:lib"))
94-
// api(project(":pluto-plugins:plugins:network:interceptor-okhttp:lib"))
54+
api(project(":pluto-plugins:plugins:network:core:lib"))
55+
api(project(":pluto-plugins:plugins:network:interceptor-ktor:lib"))
56+
api(project(":pluto-plugins:plugins:network:interceptor-okhttp:lib"))
9557
api(project(":pluto-plugins:plugins:shared-preferences:lib"))
9658
api(project(":pluto-plugins:plugins:logger:lib"))
9759
api(project(":pluto-plugins:plugins:datastore:lib"))

‎pluto-plugins/plugins/datastore/lib-no-op/build.gradle‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)