Merge pull request #1 from softnepo/fix/rollbackGradleSupport

fix: rollback gradle version and new settings to sign package
softnepo · Feb 14, 2023 · 9ca0e5f · 9ca0e5f
2 parents e41c7a7 + 74c0b32
commit 9ca0e5f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,17 +1,16 @@
 import org.jetbrains.kotlin.konan.file.use
 import java.util.*
 import java.net.*
-import kotlin.arrayOf
 
 plugins {
     `kotlin-dsl`
     `maven-publish`
-    `signing`
-    `java`
+    signing
+    java
 }
 
 group = "top.softnepo.easy-logic"
-sourceSets.main { java.srcDirs(arrayOf("src")) }
+version = "0.0.11-experimental"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_11
@@ -45,7 +44,7 @@ afterEvaluate {
             create<MavenPublication>("libraryMaven") {
                 groupId = "top.softnepo"
                 artifactId = "easy-logic"
-                version = "0.0.4-experimental"
+                version = "0.0.12-experimental"
 
                 from(components["java"])
 
@@ -91,10 +90,7 @@ afterEvaluate {
         }
     }
 
-    configure<SigningExtension> {
-        isRequired = true
-        val publishing: PublishingExtension by project
-        useGpgCmd()
-        sign(publishing.publications)
+    signing {
+        sign(publishing.publications.getByName("libraryMaven"))
     }
 }
diff --git a/core/src/main/java/top/softnepo/public/EasyLogicSupport.kt b/core/src/main/java/top/softnepo/public/EasyLogicSupport.kt
@@ -13,16 +13,14 @@ fun org.gradle.api.Project.`getLibrary`(onLibraryExtension: LibraryExtension.()
     onLibraryExtension(this)
 }
 
-fun org.gradle.api.Project.`getCatalog`() = extensions.getByType<VersionCatalogsExtension>().named(
-        "libs"
-)
+fun org.gradle.api.Project.`getCatalogApi`() = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
 fun org.gradle.api.Project.`easyLogicBuild`(settings: EasyLogicAndroidScope.() -> Unit) = getLibrary {
     settings(EasyLogicAndroidScope(this))
 }
 
 fun org.gradle.api.Project.`easyLogicDependency`(settings: EasyLogicDependencyScope.() -> Unit) = dependencies {
-    settings(EasyLogicDependencyScope(this, getCatalog()))
+    settings(EasyLogicDependencyScope(this, getCatalogApi()))
 }
 
 fun org.gradle.api.Project.`easyLogicPlugins`(settings: EasyLogicPluginManagerScope.() -> Unit) = settings(EasyLogicPluginManagerScope(pluginManager))
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/publish.sh b/publish.sh
@@ -1 +1,3 @@
-./gradlew core:build core:assemble core:signLibraryMavenPublication core:publishAllPublicationsToOSSRHRepository
+./gradlew core:build core:assemble
+./gradlew sign -Psigning.secretKeyRingFile="$sign_secretKeyRingFile" -Psigning.password="$sign_password" -Psigning.keyId="$sign_keyId"
+./gradlew core:publishLibraryMavenPublicationToOSSRHRepository