diff --git a/build.gradle.kts b/build.gradle.kts index 8fd5df1..c0b9187 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ buildscript { repositories { maven { - url = uri("https://repository.elex-project.com/repository/maven") + url = uri(project.findProperty("repo.url") as String) } } } diff --git a/buildSrc/src/main/kotlin/elex-base.gradle.kts b/buildSrc/src/main/kotlin/elex-base.gradle.kts index 3428a87..ef6cf95 100644 --- a/buildSrc/src/main/kotlin/elex-base.gradle.kts +++ b/buildSrc/src/main/kotlin/elex-base.gradle.kts @@ -8,7 +8,7 @@ description = ""//todo repositories { maven { - url = uri("https://repository.elex-project.com/repository/maven") + url = uri(project.findProperty("repo.url") as String) } } @@ -53,14 +53,14 @@ tasks.javadoc { } dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) - implementation("org.slf4j:slf4j-api:1.7.30") - implementation("org.jetbrains:annotations:22.0.0") + implementation("org.slf4j:slf4j-api:2.0.6") + implementation("org.jetbrains:annotations:24.0.0") - compileOnly("org.projectlombok:lombok:1.18.20") - annotationProcessor("org.projectlombok:lombok:1.18.20") - testAnnotationProcessor("org.projectlombok:lombok:1.18.20") + compileOnly("org.projectlombok:lombok:1.18.26") + annotationProcessor("org.projectlombok:lombok:1.18.26") + testAnnotationProcessor("org.projectlombok:lombok:1.18.26") - testImplementation("ch.qos.logback:logback-classic:1.2.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.7.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0") + testImplementation("ch.qos.logback:logback-classic:1.4.5") + testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") } diff --git a/buildSrc/src/main/kotlin/elex-library.gradle.kts b/buildSrc/src/main/kotlin/elex-library.gradle.kts index 4e0ad41..41ed01c 100644 --- a/buildSrc/src/main/kotlin/elex-library.gradle.kts +++ b/buildSrc/src/main/kotlin/elex-library.gradle.kts @@ -35,7 +35,7 @@ publishing { license { // todo name.set("Apache License 2.0") - url.set("https://github.com/elex-project/${rootProject.name}/blob/main/LICENSE") + url.set("https://git.elex-project.com/elex/${rootProject.name}/blob/main/LICENSE") comments.set("") } } @@ -61,9 +61,9 @@ publishing { } scm { // todo - connection.set("scm:git:https://github.com/elex-project/${rootProject.name}.git") - developerConnection.set("scm:git:https://github.com/elex-project/${rootProject.name}.git") - url.set("https://github.com/elex-project/${rootProject.name}/") + connection.set("scm:git:https://git.elex-project.com/elex/${rootProject.name}.git") + developerConnection.set("scm:git:https://git.elex-project.com/elex/${rootProject.name}.git") + url.set("https://git.elex-project.com/elex/${rootProject.name}/") } } } @@ -72,8 +72,8 @@ publishing { repositories { maven { name = "mavenElex" - val urlRelease = uri("https://repository.elex-project.com/repository/maven-releases") - val urlSnapshot = uri("https://repository.elex-project.com/repository/maven-snapshots") + val urlRelease = uri(project.findProperty("repo.release.url") as String) + val urlSnapshot = uri(project.findProperty("repo.snapshot.url") as String) url = if (version.toString().endsWith("SNAPSHOT")) urlSnapshot else urlRelease // Repository credential, Must be defined in ~/.gradle/gradle.properties credentials { @@ -83,7 +83,7 @@ publishing { } maven { //todo name = "mavenGithub" - url = uri("https://maven.pkg.github.com/elex-project/${rootProject.name}") + url = uri("https://maven.pkg.git.elex-project.com/elex/${rootProject.name}") credentials { username = project.findProperty("github.username") as String password = project.findProperty("github.token") as String diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 95ea0aa..8596f93 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -7,6 +7,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStorePath=wrapper/dists \ No newline at end of file