Skip to content

Commit e120bec

Browse files
zihluwangzihluwang
committed
build: Change build scripts.
1 parent 644d696 commit e120bec

File tree

11 files changed

+100
-127
lines changed

11 files changed

+100
-127
lines changed

‎build.gradle.kts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515
* limitations under the License.
1616
*/
1717

18-
val projectUrl by extra("https://codecrafters.org.cn/JDevKit")
19-
val projectGithubUrl by extra("https://github.com/CodeCraftersCN/JDevKit")
20-
val globalGroupId by extra("cn.org.codecrafters")
21-
val globalVersion by extra("1.2.2-gradle")
22-
val licenseName by extra("The Apache License, Version 2.0")
23-
val licenseUrl by extra("https://www.apache.org/licenses/LICENSE-2.0.txt")
24-
2518
val logbackVersion: String by project
2619
val junitVersion: String by project
2720
val slf4jVersion: String by project

‎devkit-core/build.gradle.kts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import java.net.URI
22

3-
val globalGroupId: String by rootProject.extra
4-
val globalVersion: String by rootProject.extra
5-
val projectUrl: String by rootProject.extra
6-
val projectGithubUrl: String by rootProject.extra
7-
val licenseName: String by rootProject.extra
8-
val licenseUrl: String by rootProject.extra
3+
val sGroupId: String by project
4+
val sVersion: String by project
5+
val projectUrl: String by project
6+
val projectGithubUrl: String by project
7+
val licenseName: String by project
8+
val licenseUrl: String by project
99

10-
group = globalGroupId
11-
version = globalVersion
10+
group = sGroupId
11+
version = sVersion
1212

1313
java {
1414
sourceCompatibility = JavaVersion.VERSION_17
@@ -24,9 +24,9 @@ tasks.test {
2424
publishing {
2525
publications {
2626
create<MavenPublication>("devkitCore") {
27-
groupId = globalGroupId
27+
groupId = sGroupId
2828
artifactId = "devkit-core"
29-
version = globalVersion
29+
version = sVersion
3030

3131
pom {
3232
name = "DevKit - Core"
@@ -39,7 +39,7 @@ publishing {
3939
url = licenseUrl
4040
}
4141
}
42-
42+
4343
scm {
4444
connection = "scm:git:git://github.com:CodeCraftersCN/JDevKit.git"
4545
developerConnection = "scm:git:git://github.com:CodeCraftersCN/JDevKit.git"

‎devkit-utils/build.gradle.kts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import java.net.URI
22

3-
val globalGroupId: String by rootProject.extra
4-
val globalVersion: String by rootProject.extra
5-
val projectUrl: String by rootProject.extra
6-
val projectGithubUrl: String by rootProject.extra
7-
val licenseName: String by rootProject.extra
8-
val licenseUrl: String by rootProject.extra
3+
val sGroupId: String by project
4+
val sVersion: String by project
5+
val projectUrl: String by project
6+
val projectGithubUrl: String by project
7+
val licenseName: String by project
8+
val licenseUrl: String by project
99

10-
group = globalGroupId
11-
version = globalVersion
10+
group = sGroupId
11+
version = sVersion
1212

1313
dependencies {
1414
implementation(project(":devkit-core"))
@@ -28,9 +28,9 @@ tasks.test {
2828
publishing {
2929
publications {
3030
create<MavenPublication>("devkitUtils") {
31-
groupId = globalGroupId
31+
groupId = sGroupId
3232
artifactId = "devkit-utils"
33-
version = globalVersion
33+
version = sVersion
3434

3535
pom {
3636
name = "DevKit - Utils"

‎gradle.properties‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,11 @@ javaJwtVersion=4.4.0
2424
jjwtVersion=0.11.5
2525
okhttpVersion=4.12.0
2626
springVersion=6.1.1
27-
springBootVersion=3.2.0
27+
springBootVersion=3.2.0
28+
29+
sGroupId=cn.org.codecrafters
30+
sVersion=1.2.2-gradle
31+
projectUrl=https://codecrafters.org.cn/JDevKit
32+
projectGithubUrl=https://github.com/CodeCraftersCN/JDevKit
33+
licenseName=The Apache License, Version 2.0
34+
licenseUrl=https://www.apache.org/licenses/LICENSE-2.0.txt

‎guid/build.gradle.kts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import java.net.URI
22

3-
val globalGroupId: String by rootProject.extra
4-
val globalVersion: String by rootProject.extra
5-
val projectUrl: String by rootProject.extra
6-
val projectGithubUrl: String by rootProject.extra
7-
val licenseName: String by rootProject.extra
8-
val licenseUrl: String by rootProject.extra
3+
val sGroupId: String by project
4+
val sVersion: String by project
5+
val projectUrl: String by project
6+
val projectGithubUrl: String by project
7+
val licenseName: String by project
8+
val licenseUrl: String by project
99

10-
group = globalGroupId
11-
version = globalVersion
10+
group = sGroupId
11+
version = sVersion
1212

1313
dependencies {
1414
implementation(project(":devkit-core"))
@@ -28,9 +28,9 @@ tasks.test {
2828
publishing {
2929
publications {
3030
create<MavenPublication>("guid") {
31-
groupId = globalGroupId
31+
groupId = sGroupId
3232
artifactId = "guid"
33-
version = globalVersion
33+
version = sVersion
3434

3535
pom {
3636
name = "DevKit - GUID"

‎property-guard-spring-boot-starter/build.gradle.kts‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
11
import java.net.URI
22

3-
val globalGroupId: String by rootProject.extra
4-
val globalVersion: String by rootProject.extra
5-
val projectUrl: String by rootProject.extra
6-
val projectGithubUrl: String by rootProject.extra
7-
val licenseName: String by rootProject.extra
8-
val licenseUrl: String by rootProject.extra
3+
val sGroupId: String by project
4+
val sVersion: String by project
5+
val projectUrl: String by project
6+
val projectGithubUrl: String by project
7+
val licenseName: String by project
8+
val licenseUrl: String by project
99

10-
val logbackVersion: String by project
11-
val junitVersion: String by project
12-
val slf4jVersion: String by project
13-
val lombokVersion: String by project
14-
val jacksonVersion: String by project
15-
val javaJwtVersion: String by project
16-
val jjwtVersion: String by project
17-
val okhttpVersion: String by project
18-
val springVersion: String by project
1910
val springBootVersion: String by project
2011

21-
group = globalGroupId
22-
version = globalVersion
12+
group = sGroupId
13+
version = sVersion
2314

2415
dependencies {
2516
implementation(project(":devkit-utils"))
@@ -43,9 +34,9 @@ tasks.test {
4334
publishing {
4435
publications {
4536
create<MavenPublication>("propertyGuardSpringBootStarter") {
46-
groupId = globalGroupId
37+
groupId = sGroupId
4738
artifactId = "property-guard-spring-boot-starter"
48-
version = globalVersion
39+
version = sVersion
4940

5041
pom {
5142
name = "Property Guard Spring Boot Starter"

‎simple-jwt-authzero/build.gradle.kts‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
import java.net.URI
22

3-
val globalGroupId: String by rootProject.extra
4-
val globalVersion: String by rootProject.extra
5-
val projectUrl: String by rootProject.extra
6-
val projectGithubUrl: String by rootProject.extra
7-
val licenseName: String by rootProject.extra
8-
val licenseUrl: String by rootProject.extra
3+
val sGroupId: String by project
4+
val sVersion: String by project
5+
val projectUrl: String by project
6+
val projectGithubUrl: String by project
7+
val licenseName: String by project
8+
val licenseUrl: String by project
99

1010
val jacksonVersion: String by project
1111
val javaJwtVersion: String by project
12-
val jjwtVersion: String by project
13-
val okhttpVersion: String by project
14-
val springVersion: String by project
15-
val springBootVersion: String by project
1612

17-
group = globalGroupId
18-
version = globalVersion
13+
group = sGroupId
14+
version = sVersion
1915

2016
dependencies {
2117
implementation(project(":devkit-utils"))
@@ -39,9 +35,9 @@ tasks.test {
3935
publishing {
4036
publications {
4137
create<MavenPublication>("simpleJwtAuthzero") {
42-
groupId = globalGroupId
38+
groupId = sGroupId
4339
artifactId = "simple-jwt-authzero"
44-
version = globalVersion
40+
version = sVersion
4541

4642
pom {
4743
name = "Simple JWT :: Auth0"

‎simple-jwt-facade/build.gradle.kts‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
import java.net.URI
22

3-
val globalGroupId: String by rootProject.extra
4-
val globalVersion: String by rootProject.extra
5-
val projectUrl: String by rootProject.extra
6-
val projectGithubUrl: String by rootProject.extra
7-
val licenseName: String by rootProject.extra
8-
val licenseUrl: String by rootProject.extra
3+
val sGroupId: String by project
4+
val sVersion: String by project
5+
val projectUrl: String by project
6+
val projectGithubUrl: String by project
7+
val licenseName: String by project
8+
val licenseUrl: String by project
99

10-
val jacksonVersion: String by project
11-
val javaJwtVersion: String by project
12-
val jjwtVersion: String by project
13-
val okhttpVersion: String by project
14-
val springVersion: String by project
15-
val springBootVersion: String by project
16-
17-
group = globalGroupId
18-
version = globalVersion
10+
group = sGroupId
11+
version = sVersion
1912

2013
dependencies {
2114
implementation(project(":devkit-core"))
@@ -37,9 +30,9 @@ tasks.test {
3730
publishing {
3831
publications {
3932
create<MavenPublication>("simpleJwtFacade") {
40-
groupId = globalGroupId
33+
groupId = sGroupId
4134
artifactId = "simple-jwt-facade"
42-
version = globalVersion
35+
version = sVersion
4336

4437
pom {
4538
name = "Simple JWT :: Facade"

‎simple-jwt-jjwt/build.gradle.kts‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
import java.net.URI
22

3-
val globalGroupId: String by rootProject.extra
4-
val globalVersion: String by rootProject.extra
5-
val projectUrl: String by rootProject.extra
6-
val projectGithubUrl: String by rootProject.extra
7-
val licenseName: String by rootProject.extra
8-
val licenseUrl: String by rootProject.extra
3+
val sGroupId: String by project
4+
val sVersion: String by project
5+
val projectUrl: String by project
6+
val projectGithubUrl: String by project
7+
val licenseName: String by project
8+
val licenseUrl: String by project
99

1010
val jacksonVersion: String by project
11-
val javaJwtVersion: String by project
1211
val jjwtVersion: String by project
13-
val okhttpVersion: String by project
14-
val springVersion: String by project
15-
val springBootVersion: String by project
1612

17-
group = globalGroupId
18-
version = globalVersion
13+
group = sGroupId
14+
version = sVersion
1915

2016
dependencies {
2117
implementation(project(":devkit-utils"))
@@ -41,9 +37,9 @@ tasks.test {
4137
publishing {
4238
publications {
4339
create<MavenPublication>("simpleJwtJjwt") {
44-
groupId = globalGroupId
40+
groupId = sGroupId
4541
artifactId = "simple-jwt-jjwt"
46-
version = globalVersion
42+
version = sVersion
4743

4844
pom {
4945
name = "Simple JWT :: JJWT"

‎simple-jwt-spring-boot-starter/build.gradle.kts‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,19 @@
1717

1818
import java.net.URI
1919

20-
val globalGroupId: String by rootProject.extra
21-
val globalVersion: String by rootProject.extra
22-
val projectUrl: String by rootProject.extra
23-
val projectGithubUrl: String by rootProject.extra
24-
val licenseName: String by rootProject.extra
25-
val licenseUrl: String by rootProject.extra
26-
27-
val jacksonVersion: String by project
20+
val sGroupId: String by project
21+
val sVersion: String by project
22+
val projectUrl: String by project
23+
val projectGithubUrl: String by project
24+
val licenseName: String by project
25+
val licenseUrl: String by project
26+
2827
val javaJwtVersion: String by project
2928
val jjwtVersion: String by project
30-
val okhttpVersion: String by project
31-
val springVersion: String by project
3229
val springBootVersion: String by project
3330

34-
group = globalGroupId
35-
version = globalVersion
31+
group = sGroupId
32+
version = sVersion
3633

3734
dependencies {
3835
implementation(project(":guid"))
@@ -63,9 +60,9 @@ tasks.test {
6360
publishing {
6461
publications {
6562
create<MavenPublication>("guid") {
66-
groupId = globalGroupId
63+
groupId = sGroupId
6764
artifactId = "guid"
68-
version = globalVersion
65+
version = sVersion
6966

7067
pom {
7168
name = "DevKit - GUID"

0 commit comments

Comments
 (0)