From e120becf9425ae245a403b3c21295840e2a04f24 Mon Sep 17 00:00:00 2001 From: Zihlu Wang Date: Wed, 31 Jan 2024 11:10:48 +0800 Subject: [PATCH] build: Change build scripts. --- build.gradle.kts | 7 ----- devkit-core/build.gradle.kts | 22 +++++++------- devkit-utils/build.gradle.kts | 20 ++++++------- gradle.properties | 9 +++++- guid/build.gradle.kts | 20 ++++++------- .../build.gradle.kts | 29 +++++++------------ simple-jwt-authzero/build.gradle.kts | 24 +++++++-------- simple-jwt-facade/build.gradle.kts | 27 +++++++---------- simple-jwt-jjwt/build.gradle.kts | 24 +++++++-------- .../build.gradle.kts | 23 +++++++-------- webcal/build.gradle.kts | 20 ++++++------- 11 files changed, 99 insertions(+), 126 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f35ae46..924ad1c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,13 +15,6 @@ * limitations under the License. */ -val projectUrl by extra("https://codecrafters.org.cn/JDevKit") -val projectGithubUrl by extra("https://github.com/CodeCraftersCN/JDevKit") -val globalGroupId by extra("cn.org.codecrafters") -val globalVersion by extra("1.2.2-gradle") -val licenseName by extra("The Apache License, Version 2.0") -val licenseUrl by extra("https://www.apache.org/licenses/LICENSE-2.0.txt") - val logbackVersion: String by project val junitVersion: String by project val slf4jVersion: String by project diff --git a/devkit-core/build.gradle.kts b/devkit-core/build.gradle.kts index 137b942..8263422 100644 --- a/devkit-core/build.gradle.kts +++ b/devkit-core/build.gradle.kts @@ -1,14 +1,14 @@ import java.net.URI -val globalGroupId: String by rootProject.extra -val globalVersion: String by rootProject.extra -val projectUrl: String by rootProject.extra -val projectGithubUrl: String by rootProject.extra -val licenseName: String by rootProject.extra -val licenseUrl: String by rootProject.extra +val sGroupId: String by project +val sVersion: String by project +val projectUrl: String by project +val projectGithubUrl: String by project +val licenseName: String by project +val licenseUrl: String by project -group = globalGroupId -version = globalVersion +group = sGroupId +version = sVersion java { sourceCompatibility = JavaVersion.VERSION_17 @@ -24,9 +24,9 @@ tasks.test { publishing { publications { create("devkitCore") { - groupId = globalGroupId + groupId = sGroupId artifactId = "devkit-core" - version = globalVersion + version = sVersion pom { name = "DevKit - Core" @@ -39,7 +39,7 @@ publishing { url = licenseUrl } } - + scm { connection = "scm:git:git://github.com:CodeCraftersCN/JDevKit.git" developerConnection = "scm:git:git://github.com:CodeCraftersCN/JDevKit.git" diff --git a/devkit-utils/build.gradle.kts b/devkit-utils/build.gradle.kts index 1df3520..06c7c6b 100644 --- a/devkit-utils/build.gradle.kts +++ b/devkit-utils/build.gradle.kts @@ -1,14 +1,14 @@ import java.net.URI -val globalGroupId: String by rootProject.extra -val globalVersion: String by rootProject.extra -val projectUrl: String by rootProject.extra -val projectGithubUrl: String by rootProject.extra -val licenseName: String by rootProject.extra -val licenseUrl: String by rootProject.extra +val sGroupId: String by project +val sVersion: String by project +val projectUrl: String by project +val projectGithubUrl: String by project +val licenseName: String by project +val licenseUrl: String by project -group = globalGroupId -version = globalVersion +group = sGroupId +version = sVersion dependencies { implementation(project(":devkit-core")) @@ -28,9 +28,9 @@ tasks.test { publishing { publications { create("devkitUtils") { - groupId = globalGroupId + groupId = sGroupId artifactId = "devkit-utils" - version = globalVersion + version = sVersion pom { name = "DevKit - Utils" diff --git a/gradle.properties b/gradle.properties index 597b8e4..088f980 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,11 @@ javaJwtVersion=4.4.0 jjwtVersion=0.11.5 okhttpVersion=4.12.0 springVersion=6.1.1 -springBootVersion=3.2.0 \ No newline at end of file +springBootVersion=3.2.0 + +sGroupId=cn.org.codecrafters +sVersion=1.2.2-gradle +projectUrl=https://codecrafters.org.cn/JDevKit +projectGithubUrl=https://github.com/CodeCraftersCN/JDevKit +licenseName=The Apache License, Version 2.0 +licenseUrl=https://www.apache.org/licenses/LICENSE-2.0.txt \ No newline at end of file diff --git a/guid/build.gradle.kts b/guid/build.gradle.kts index e56c8bc..af5fc45 100644 --- a/guid/build.gradle.kts +++ b/guid/build.gradle.kts @@ -1,14 +1,14 @@ import java.net.URI -val globalGroupId: String by rootProject.extra -val globalVersion: String by rootProject.extra -val projectUrl: String by rootProject.extra -val projectGithubUrl: String by rootProject.extra -val licenseName: String by rootProject.extra -val licenseUrl: String by rootProject.extra +val sGroupId: String by project +val sVersion: String by project +val projectUrl: String by project +val projectGithubUrl: String by project +val licenseName: String by project +val licenseUrl: String by project -group = globalGroupId -version = globalVersion +group = sGroupId +version = sVersion dependencies { implementation(project(":devkit-core")) @@ -28,9 +28,9 @@ tasks.test { publishing { publications { create("guid") { - groupId = globalGroupId + groupId = sGroupId artifactId = "guid" - version = globalVersion + version = sVersion pom { name = "DevKit - GUID" diff --git a/property-guard-spring-boot-starter/build.gradle.kts b/property-guard-spring-boot-starter/build.gradle.kts index 2d72020..48005f9 100644 --- a/property-guard-spring-boot-starter/build.gradle.kts +++ b/property-guard-spring-boot-starter/build.gradle.kts @@ -1,25 +1,16 @@ import java.net.URI -val globalGroupId: String by rootProject.extra -val globalVersion: String by rootProject.extra -val projectUrl: String by rootProject.extra -val projectGithubUrl: String by rootProject.extra -val licenseName: String by rootProject.extra -val licenseUrl: String by rootProject.extra +val sGroupId: String by project +val sVersion: String by project +val projectUrl: String by project +val projectGithubUrl: String by project +val licenseName: String by project +val licenseUrl: String by project -val logbackVersion: String by project -val junitVersion: String by project -val slf4jVersion: String by project -val lombokVersion: String by project -val jacksonVersion: String by project -val javaJwtVersion: String by project -val jjwtVersion: String by project -val okhttpVersion: String by project -val springVersion: String by project val springBootVersion: String by project -group = globalGroupId -version = globalVersion +group = sGroupId +version = sVersion dependencies { implementation(project(":devkit-utils")) @@ -43,9 +34,9 @@ tasks.test { publishing { publications { create("propertyGuardSpringBootStarter") { - groupId = globalGroupId + groupId = sGroupId artifactId = "property-guard-spring-boot-starter" - version = globalVersion + version = sVersion pom { name = "Property Guard Spring Boot Starter" diff --git a/simple-jwt-authzero/build.gradle.kts b/simple-jwt-authzero/build.gradle.kts index 90983f1..0549ea6 100644 --- a/simple-jwt-authzero/build.gradle.kts +++ b/simple-jwt-authzero/build.gradle.kts @@ -1,21 +1,17 @@ import java.net.URI -val globalGroupId: String by rootProject.extra -val globalVersion: String by rootProject.extra -val projectUrl: String by rootProject.extra -val projectGithubUrl: String by rootProject.extra -val licenseName: String by rootProject.extra -val licenseUrl: String by rootProject.extra +val sGroupId: String by project +val sVersion: String by project +val projectUrl: String by project +val projectGithubUrl: String by project +val licenseName: String by project +val licenseUrl: String by project val jacksonVersion: String by project val javaJwtVersion: String by project -val jjwtVersion: String by project -val okhttpVersion: String by project -val springVersion: String by project -val springBootVersion: String by project -group = globalGroupId -version = globalVersion +group = sGroupId +version = sVersion dependencies { implementation(project(":devkit-utils")) @@ -39,9 +35,9 @@ tasks.test { publishing { publications { create("simpleJwtAuthzero") { - groupId = globalGroupId + groupId = sGroupId artifactId = "simple-jwt-authzero" - version = globalVersion + version = sVersion pom { name = "Simple JWT :: Auth0" diff --git a/simple-jwt-facade/build.gradle.kts b/simple-jwt-facade/build.gradle.kts index 5619929..58877e2 100644 --- a/simple-jwt-facade/build.gradle.kts +++ b/simple-jwt-facade/build.gradle.kts @@ -1,21 +1,14 @@ import java.net.URI -val globalGroupId: String by rootProject.extra -val globalVersion: String by rootProject.extra -val projectUrl: String by rootProject.extra -val projectGithubUrl: String by rootProject.extra -val licenseName: String by rootProject.extra -val licenseUrl: String by rootProject.extra +val sGroupId: String by project +val sVersion: String by project +val projectUrl: String by project +val projectGithubUrl: String by project +val licenseName: String by project +val licenseUrl: String by project -val jacksonVersion: String by project -val javaJwtVersion: String by project -val jjwtVersion: String by project -val okhttpVersion: String by project -val springVersion: String by project -val springBootVersion: String by project - -group = globalGroupId -version = globalVersion +group = sGroupId +version = sVersion dependencies { implementation(project(":devkit-core")) @@ -37,9 +30,9 @@ tasks.test { publishing { publications { create("simpleJwtFacade") { - groupId = globalGroupId + groupId = sGroupId artifactId = "simple-jwt-facade" - version = globalVersion + version = sVersion pom { name = "Simple JWT :: Facade" diff --git a/simple-jwt-jjwt/build.gradle.kts b/simple-jwt-jjwt/build.gradle.kts index d7ef43b..5f7fe2c 100644 --- a/simple-jwt-jjwt/build.gradle.kts +++ b/simple-jwt-jjwt/build.gradle.kts @@ -1,21 +1,17 @@ import java.net.URI -val globalGroupId: String by rootProject.extra -val globalVersion: String by rootProject.extra -val projectUrl: String by rootProject.extra -val projectGithubUrl: String by rootProject.extra -val licenseName: String by rootProject.extra -val licenseUrl: String by rootProject.extra +val sGroupId: String by project +val sVersion: String by project +val projectUrl: String by project +val projectGithubUrl: String by project +val licenseName: String by project +val licenseUrl: String by project val jacksonVersion: String by project -val javaJwtVersion: String by project val jjwtVersion: String by project -val okhttpVersion: String by project -val springVersion: String by project -val springBootVersion: String by project -group = globalGroupId -version = globalVersion +group = sGroupId +version = sVersion dependencies { implementation(project(":devkit-utils")) @@ -41,9 +37,9 @@ tasks.test { publishing { publications { create("simpleJwtJjwt") { - groupId = globalGroupId + groupId = sGroupId artifactId = "simple-jwt-jjwt" - version = globalVersion + version = sVersion pom { name = "Simple JWT :: JJWT" diff --git a/simple-jwt-spring-boot-starter/build.gradle.kts b/simple-jwt-spring-boot-starter/build.gradle.kts index 9ce5066..a931b81 100644 --- a/simple-jwt-spring-boot-starter/build.gradle.kts +++ b/simple-jwt-spring-boot-starter/build.gradle.kts @@ -17,22 +17,19 @@ import java.net.URI -val globalGroupId: String by rootProject.extra -val globalVersion: String by rootProject.extra -val projectUrl: String by rootProject.extra -val projectGithubUrl: String by rootProject.extra -val licenseName: String by rootProject.extra -val licenseUrl: String by rootProject.extra +val sGroupId: String by project +val sVersion: String by project +val projectUrl: String by project +val projectGithubUrl: String by project +val licenseName: String by project +val licenseUrl: String by project -val jacksonVersion: String by project val javaJwtVersion: String by project val jjwtVersion: String by project -val okhttpVersion: String by project -val springVersion: String by project val springBootVersion: String by project -group = globalGroupId -version = globalVersion +group = sGroupId +version = sVersion dependencies { implementation(project(":guid")) @@ -63,9 +60,9 @@ tasks.test { publishing { publications { create("guid") { - groupId = globalGroupId + groupId = sGroupId artifactId = "guid" - version = globalVersion + version = sVersion pom { name = "DevKit - GUID" diff --git a/webcal/build.gradle.kts b/webcal/build.gradle.kts index e56c8bc..af5fc45 100644 --- a/webcal/build.gradle.kts +++ b/webcal/build.gradle.kts @@ -1,14 +1,14 @@ import java.net.URI -val globalGroupId: String by rootProject.extra -val globalVersion: String by rootProject.extra -val projectUrl: String by rootProject.extra -val projectGithubUrl: String by rootProject.extra -val licenseName: String by rootProject.extra -val licenseUrl: String by rootProject.extra +val sGroupId: String by project +val sVersion: String by project +val projectUrl: String by project +val projectGithubUrl: String by project +val licenseName: String by project +val licenseUrl: String by project -group = globalGroupId -version = globalVersion +group = sGroupId +version = sVersion dependencies { implementation(project(":devkit-core")) @@ -28,9 +28,9 @@ tasks.test { publishing { publications { create("guid") { - groupId = globalGroupId + groupId = sGroupId artifactId = "guid" - version = globalVersion + version = sVersion pom { name = "DevKit - GUID"