修改build.gradle.kts

build.gradle.kts

@@ -1,9 +0,0 @@
-plugins {
-    `kotlin-dsl`
-    id("com.vanniktech.maven.publish") version "0.30.0" apply false
-    //id("tech.yanand.maven-central-publish") version "1.3.0" apply false
-}
-
-group = "net.risesoft.y9"
-version = "0.0.2"
-

gradle.properties

@@ -3,6 +3,7 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -Dfile.encoding=UTF-8
 
 testsEnabled=false
+Y9_VERSION=v9.7.0-SNAPSHOT
 Y9BOM_VERSION=9.7.0
 PROJECT_GIT_URL=https://github.com/risesoft-y9/Digital-Infrastructure
 PROJECT_SCM_URL=scm:git:https://github.com/risesoft-y9/Digital-Infrastructure.git

risenet-gradle-build-logic/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     `kotlin-dsl`
     `maven-publish`
     signing
-    id("com.vanniktech.maven.publish")
+    id("com.vanniktech.maven.publish") version "0.30.0"
 }
 
 dependencies {
@@ -15,11 +15,16 @@ dependencies {
     implementation("io.freefair.gradle:aspectj-plugin:8.11")
     implementation("io.freefair.gradle:lombok-plugin:8.11")
     implementation("tech.yanand.gradle:maven-central-publish:1.3.0")
-    implementation("com.vanniktech:gradle-maven-publish-plugin:0.13.0")
+    implementation("com.vanniktech:gradle-maven-publish-plugin:0.30.0")
 }
 
-group = rootProject.group.toString()
+repositories {
-version = rootProject.version.toString()
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+group = "net.risesoft.y9"
+version = "9.7.0"
 
 signing {
     //useGpgCmd()

risenet-gradle-build-logic/src/main/kotlin/net.risesoft.y9.java-conventions.gradle.kts

@@ -1,5 +1,3 @@
-import gradle.kotlin.dsl.accessors._b43a41b3a2c24e7f863347686afebb31.versionCatalogs
-
 plugins {
     id("java-library")
     id("net.risesoft.y9.management")
@@ -7,14 +5,7 @@ plugins {
 }
 
 group = "net.risesoft"
-
+version = findProperty("Y9_VERSION").toString()
-val versionCatalog = versionCatalogs.named("libs")
-val y9version = versionCatalog.findVersion("y9-version")
-if(y9version.isPresent) {
-    version = y9version.get().displayName
-} else {
-    version = "v9.7.0-SNAPSHOT"
-}
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

risenet-gradle-build-logic/src/main/kotlin/net.risesoft.y9.java-publish.gradle.kts

@@ -9,16 +9,8 @@ plugins {
     id("net.risesoft.y9.repository")
 }
 
-val versionCatalog = versionCatalogs.named("libs")
+group = "net.risesoft"
-val y9version = versionCatalog.findVersion("y9-version")
+version = findProperty("Y9_VERSION").toString()
-if(y9version.isPresent) {
-    version = y9version.get().displayName
-} else {
-    version = "v9.7.0-SNAPSHOT"
-}
-
-extra.set("PROJECT_GIT_URL", "https://github.com/risesoft-y9/Digital-Infrastructure")
-extra.set("PROJECT_SCM_URL", "scm:git:https://github.com/risesoft-y9/Digital-Infrastructure.git")
 
 publishing {
     publications {

risenet-gradle-build-logic/src/main/kotlin/net.risesoft.y9.javaPlatform-publish.gradle.kts

@@ -5,6 +5,9 @@ plugins {
     id("net.risesoft.y9.repository")
 }
 
+group = "net.risesoft"
+version = findProperty("Y9_VERSION").toString()
+
 publishing {
     publications {
         repositories {

risenet-gradle-build-logic/src/main/kotlin/net.risesoft.y9.management.gradle.kts

@@ -54,5 +54,5 @@ java.sourceSets.forEach { t ->
 }
 
 //val dependency = project.dependencies.platform(project.dependencies.project(":y9-digitalbase-dependencies"))
-val dependency = project.dependencies.platform("net.risesoft.y9:y9-digitalbase-dependencies:0.0.1")
+//val dependency = project.dependencies.platform("net.risesoft.y9:y9-digitalbase-dependencies:0.0.1")
-management.dependencies.add(dependency)
+//management.dependencies.add(dependency)

risenet-gradle-version-catalog/build.gradle.kts

@@ -4,11 +4,22 @@ import com.vanniktech.maven.publish.VersionCatalog
 plugins {
     signing
     `version-catalog`
-    id("com.vanniktech.maven.publish")
+    id("com.vanniktech.maven.publish") version "0.30.0"
 }
 
-group = rootProject.group.toString()
+repositories {
-version = rootProject.version.toString()
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+catalog {
+    versionCatalog {
+        from(files("../gradle/libs.versions.toml"))
+    }
+}
+
+group = "net.risesoft.y9"
+version = "9.7.0"
 
 signing {
     //useGpgCmd()

settings.gradle.kts

@@ -1,18 +1,4 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        mavenCentral()
-    }
-}
-
-dependencyResolutionManagement {
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
 rootProject.name = "y9-build-logic"
 
-include("risenet-gradle-build-logic")
+includeBuild("risenet-gradle-build-logic")
-include("risenet-gradle-version-catalog")
+includeBuild("risenet-gradle-version-catalog")