From 860bbc2b8f50dcefd3f0c3fc67d211abb0c776b1 Mon Sep 17 00:00:00 2001 From: Zihlu Wang Date: Wed, 31 Jan 2024 04:41:10 +0800 Subject: [PATCH] build: Finished moving to gradle. --- build.gradle.kts | 9 ++++++++- gradle.properties | 2 +- simple-jwt-authzero/build.gradle.kts | 2 ++ simple-jwt-jjwt/build.gradle.kts | 1 + simple-jwt-spring-boot-starter/build.gradle.kts | 1 + 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 216d21d..f35ae46 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ 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.3") +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") @@ -37,6 +37,8 @@ subprojects { val testImplementation by configurations val compileOnly by configurations val annotationProcessor by configurations + val testAnnotationProcessor by configurations + val testCompileOnly by configurations dependencies { compileOnly("org.slf4j:slf4j-api:$slf4jVersion") @@ -44,7 +46,12 @@ subprojects { implementation("ch.qos.logback:logback-classic:$logbackVersion") annotationProcessor("org.slf4j:slf4j-api:$slf4jVersion") annotationProcessor("org.projectlombok:lombok:$lombokVersion") + + testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion") + testCompileOnly("org.projectlombok:lombok:$lombokVersion") testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion") + testAnnotationProcessor("org.slf4j:slf4j-api:$slf4jVersion") + testAnnotationProcessor("org.projectlombok:lombok:$lombokVersion") } repositories { diff --git a/gradle.properties b/gradle.properties index 6f6335b..597b8e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ slf4jVersion=2.0.9 lombokVersion=1.18.30 jacksonVersion=2.16.0 javaJwtVersion=4.4.0 -jjwtVersion=0.12.3 +jjwtVersion=0.11.5 okhttpVersion=4.12.0 springVersion=6.1.1 springBootVersion=3.2.0 \ No newline at end of file diff --git a/simple-jwt-authzero/build.gradle.kts b/simple-jwt-authzero/build.gradle.kts index 39f387c..90983f1 100644 --- a/simple-jwt-authzero/build.gradle.kts +++ b/simple-jwt-authzero/build.gradle.kts @@ -18,6 +18,8 @@ group = globalGroupId version = globalVersion dependencies { + implementation(project(":devkit-utils")) + implementation(project(":guid")) implementation(project(":simple-jwt-facade")) implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") implementation("com.auth0:java-jwt:$javaJwtVersion") diff --git a/simple-jwt-jjwt/build.gradle.kts b/simple-jwt-jjwt/build.gradle.kts index 07bce29..d7ef43b 100644 --- a/simple-jwt-jjwt/build.gradle.kts +++ b/simple-jwt-jjwt/build.gradle.kts @@ -19,6 +19,7 @@ version = globalVersion dependencies { implementation(project(":devkit-utils")) + implementation(project(":guid")) implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") implementation("io.jsonwebtoken:jjwt-api:$jjwtVersion") implementation("io.jsonwebtoken:jjwt-impl:$jjwtVersion") diff --git a/simple-jwt-spring-boot-starter/build.gradle.kts b/simple-jwt-spring-boot-starter/build.gradle.kts index 466e5c0..9ce5066 100644 --- a/simple-jwt-spring-boot-starter/build.gradle.kts +++ b/simple-jwt-spring-boot-starter/build.gradle.kts @@ -35,6 +35,7 @@ group = globalGroupId version = globalVersion dependencies { + implementation(project(":guid")) implementation(project(":simple-jwt-facade")) compileOnly("com.auth0:java-jwt:$javaJwtVersion") compileOnly(project(":simple-jwt-authzero"))