Skip to content

Commit f9c1806

Browse files
committed
chore: publish & versioning cleanup (#334)
* deprecating nexus publishing * gradle cleanup * module publish cleanup * name refactor * publish code refactor
1 parent 97cd3b8 commit f9c1806

File tree

54 files changed

+167
-1423
lines changed

Some content is hidden

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

54 files changed

+167
-1423
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
.externalNativeBuild
88
.cxx
99
/.idea/*
10-
/scripts/publish/publish.properties
10+
/scripts/publish/_credentials.properties

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
33
alias(libs.plugins.dokka)
4-
alias(libs.plugins.gradle.nexus.publish)
54
alias(libs.plugins.android.library) apply false
65
alias(libs.plugins.android.application) apply false
76
alias(libs.plugins.kotlin.android) apply false
@@ -48,6 +47,5 @@ task prCheck {
4847
dependsOn ':pluto:validateChanges'
4948
}
5049

51-
apply from: "$rootDir/scripts/publish/root.gradle"
5250
apply from: "$rootDir/scripts/project-dependancy-graph.gradle"
5351
apply from: "$rootDir/maven-versions.gradle"

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ android-application = { id = "com.android.application", version.ref = "agp" }
3030
android-library = { id = "com.android.library", version.ref = "agp" }
3131
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
3232
dokka = { id = "org.jetbrains.dokka", version = "1.5.0" }
33-
gradle-nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.1.0" }
3433
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
3534
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
3635
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

pluto-plugins/base/lib/build.gradle

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,16 @@ plugins {
22
alias(libs.plugins.android.library)
33
alias(libs.plugins.kotlin.android)
44
}
5-
6-
apply from: "$rootDir/scripts/build/utils.gradle"
7-
apply from: "$rootDir/scripts/publish/module.gradle"
8-
9-
def verCode, verName, verBuild, verNameShort, verPublish
10-
(verCode, verName, verBuild, verNameShort, verPublish) = genVersion()
5+
apply from: "$rootDir/scripts/pluginBuilder.gradle"
116

127
ext {
138
PUBLISH_GROUP_ID = "com.plutolib"
14-
PUBLISH_VERSION = verPublish
159
PUBLISH_ARTIFACT_ID = 'plugin'
1610
}
1711

1812
android {
19-
compileSdk = libs.versions.compileSdk.get().toInteger()
20-
buildToolsVersion = libs.versions.buildTools.get()
21-
22-
buildFeatures {
23-
viewBinding true
24-
}
25-
26-
defaultConfig {
27-
minSdk = libs.versions.minSdk.get().toInteger()
28-
targetSdk = libs.versions.targetSdk.get().toInteger()
29-
}
30-
31-
buildTypes {
32-
release {
33-
debuggable true
34-
minifyEnabled false
35-
shrinkResources false
36-
}
37-
}
38-
compileOptions {
39-
sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get())
40-
targetCompatibility = JavaVersion.toVersion(libs.versions.java.get())
41-
}
42-
kotlinOptions {
43-
jvmTarget = libs.versions.java.get()
44-
}
45-
4613
resourcePrefix 'pluto___'
4714
namespace 'com.pluto.plugin'
48-
lint {
49-
abortOnError false
50-
}
5115
}
5216

5317
dependencies {

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

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,16 @@
11
plugins {
22
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
34
}
4-
5-
apply from: "$rootDir/scripts/build/utils.gradle"
6-
apply from: "$rootDir/scripts/publish/module.gradle"
7-
8-
def verCode, verName, verBuild, verNameShort, verPublish
9-
(verCode, verName, verBuild, verNameShort, verPublish) = genVersion()
5+
apply from: "$rootDir/scripts/pluginBuilder.gradle"
106

117
ext {
128
PUBLISH_GROUP_ID = "com.plutolib.plugins"
13-
PUBLISH_VERSION = verPublish
149
PUBLISH_ARTIFACT_ID = 'bundle-core-no-op'
1510
}
1611

1712
android {
18-
compileSdk = libs.versions.compileSdk.get().toInteger()
19-
buildToolsVersion = libs.versions.buildTools.get()
20-
21-
22-
defaultConfig {
23-
minSdk = libs.versions.minSdk.get().toInteger()
24-
targetSdk = libs.versions.targetSdk.get().toInteger()
25-
}
26-
27-
buildTypes {
28-
release {
29-
debuggable true
30-
minifyEnabled false
31-
shrinkResources false
32-
}
33-
}
34-
compileOptions {
35-
sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get())
36-
targetCompatibility = JavaVersion.toVersion(libs.versions.java.get())
37-
}
3813
namespace 'com.pluto.plugins.bundle.core'
39-
lint {
40-
abortOnError false
41-
}
4214
}
4315

4416
dependencies {

pluto-plugins/bundle/lib/build.gradle

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,16 @@
11
plugins {
22
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
34
}
4-
5-
apply from: "$rootDir/scripts/build/utils.gradle"
6-
apply from: "$rootDir/scripts/publish/module.gradle"
7-
8-
def verCode, verName, verBuild, verNameShort, verPublish
9-
(verCode, verName, verBuild, verNameShort, verPublish) = genVersion()
5+
apply from: "$rootDir/scripts/pluginBuilder.gradle"
106

117
ext {
128
PUBLISH_GROUP_ID = "com.plutolib.plugins"
13-
PUBLISH_VERSION = verPublish
149
PUBLISH_ARTIFACT_ID = 'bundle-core'
1510
}
1611

1712
android {
18-
compileSdk = libs.versions.compileSdk.get().toInteger()
19-
buildToolsVersion = libs.versions.buildTools.get()
20-
21-
22-
defaultConfig {
23-
minSdk = libs.versions.minSdk.get().toInteger()
24-
targetSdk = libs.versions.targetSdk.get().toInteger()
25-
}
26-
27-
buildTypes {
28-
release {
29-
debuggable true
30-
minifyEnabled false
31-
shrinkResources false
32-
}
33-
}
34-
compileOptions {
35-
sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get())
36-
targetCompatibility = JavaVersion.toVersion(libs.versions.java.get())
37-
}
3813
namespace 'com.pluto.plugins.bundle.core'
39-
lint {
40-
abortOnError false
41-
}
4214
}
4315

4416
dependencies {

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

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,15 @@ plugins {
22
alias(libs.plugins.android.library)
33
alias(libs.plugins.kotlin.android)
44
}
5-
6-
apply from: "$rootDir/scripts/build/utils.gradle"
7-
apply from: "$rootDir/scripts/publish/module.gradle"
8-
9-
def verCode, verName, verBuild, verNameShort, verPublish
10-
(verCode, verName, verBuild, verNameShort, verPublish) = genVersion()
5+
apply from: "$rootDir/scripts/pluginBuilder.gradle"
116

127
ext {
138
PUBLISH_GROUP_ID = "com.plutolib.plugins"
14-
PUBLISH_VERSION = verPublish
159
PUBLISH_ARTIFACT_ID = 'datastore-pref-no-op'
1610
}
1711

1812
android {
19-
compileSdk = libs.versions.compileSdk.get().toInteger()
20-
buildToolsVersion = libs.versions.buildTools.get()
21-
22-
buildFeatures {
23-
viewBinding true
24-
}
25-
26-
27-
defaultConfig {
28-
minSdk = libs.versions.minSdk.get().toInteger()
29-
targetSdk = libs.versions.targetSdk.get().toInteger()
30-
31-
buildConfigField "String", "VERSION_NAME", "\"${verPublish}\""
32-
buildConfigField("long", "VERSION_CODE", "${verCode}")
33-
buildConfigField "String", "GIT_SHA", "\"${gitSha()}\""
34-
}
35-
36-
buildTypes {
37-
release {
38-
debuggable true
39-
minifyEnabled false
40-
shrinkResources false
41-
}
42-
}
43-
compileOptions {
44-
sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get())
45-
targetCompatibility = JavaVersion.toVersion(libs.versions.java.get())
46-
}
47-
48-
kotlinOptions {
49-
jvmTarget = libs.versions.java.get()
50-
}
5113
namespace 'com.pluto.plugins.datastore.pref'
52-
lint {
53-
abortOnError false
54-
}
5514
}
5615

5716
dependencies {

pluto-plugins/plugins/datastore/lib/build.gradle

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@ plugins {
33
alias(libs.plugins.kotlin.android)
44
alias(libs.plugins.ksp)
55
}
6-
7-
apply from: "$rootDir/scripts/build/utils.gradle"
8-
apply from: "$rootDir/scripts/publish/module.gradle"
9-
10-
def verCode, verName, verBuild, verNameShort, verPublish
11-
(verCode, verName, verBuild, verNameShort, verPublish) = genVersion()
6+
apply from: "$rootDir/scripts/pluginBuilder.gradle"
127

138
ext {
149
PUBLISH_GROUP_ID = "com.plutolib.plugins"
@@ -17,49 +12,16 @@ ext {
1712
}
1813

1914
android {
20-
compileSdk = libs.versions.compileSdk.get().toInteger()
21-
buildToolsVersion = libs.versions.buildTools.get()
22-
2315
buildFeatures {
24-
viewBinding true
2516
compose true
2617
}
2718

28-
29-
defaultConfig {
30-
minSdk = libs.versions.minSdk.get().toInteger()
31-
targetSdk = libs.versions.targetSdk.get().toInteger()
32-
33-
buildConfigField "String", "VERSION_NAME", "\"${verPublish}\""
34-
buildConfigField("long", "VERSION_CODE", "${verCode}")
35-
buildConfigField "String", "GIT_SHA", "\"${gitSha()}\""
36-
}
37-
38-
buildTypes {
39-
release {
40-
debuggable true
41-
minifyEnabled false
42-
shrinkResources false
43-
}
44-
}
45-
compileOptions {
46-
sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get())
47-
targetCompatibility = JavaVersion.toVersion(libs.versions.java.get())
48-
}
49-
50-
kotlinOptions {
51-
jvmTarget = libs.versions.java.get()
52-
}
53-
5419
composeOptions {
5520
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
5621
}
5722

5823
resourcePrefix 'pluto_dts___'
5924
namespace 'com.pluto.plugins.datastore.pref'
60-
lint {
61-
abortOnError false
62-
}
6325
}
6426

6527
dependencies {

pluto-plugins/plugins/demo/lib-no-op/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

pluto-plugins/plugins/demo/lib-no-op/build.gradle

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

0 commit comments

Comments
 (0)