From 2e814e5cb73b3b7e7315af7041b44ccaaa641fb0 Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Sun, 15 Oct 2023 13:09:41 +0200 Subject: [PATCH] Follow https://github.com/FlorianMichael/BaseProject style --- .../workflows/gradle-wrapper-validation.yml | 10 ++++++++ build.gradle | 25 ++++--------------- gradle.properties | 8 ++++++ jitpack.yml | 9 ++++--- 4 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/gradle-wrapper-validation.yml create mode 100644 gradle.properties diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml new file mode 100644 index 0000000..b63fdf3 --- /dev/null +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -0,0 +1,10 @@ +name: "Validate Gradle Wrapper" +on: [push, pull_request] + +jobs: + validation: + name: "Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v1 diff --git a/build.gradle b/build.gradle index 62ba835..2b3d8c6 100644 --- a/build.gradle +++ b/build.gradle @@ -4,14 +4,9 @@ plugins { id "signing" } -archivesBaseName = "Classic4J" -version = "2.0.2-SNAPSHOT" -group = "de.florianmichael" - -configurations { - implementation.extendsFrom lib - api.extendsFrom lib -} +archivesBaseName = project.maven_name +version = project.maven_version +group = project.maven_group repositories { mavenCentral() @@ -30,15 +25,7 @@ java { } jar { - dependsOn configurations.lib - from { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - configurations.lib.collect { - zipTree(it) - } - } { - exclude "META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA" - } + // Rename the project's license file to LICENSE_ to avoid conflicts from("LICENSE") { rename { "${it}_${project.archivesBaseName}" @@ -50,9 +37,7 @@ publishing { repositories { maven { name = "reposilite" - def releasesUrl = "https://maven.lenni0451.net/releases" - def snapshotsUrl = "https://maven.lenni0451.net/snapshots" - url = project.version.endsWith("SNAPSHOT") ? snapshotsUrl : releasesUrl + url = "https://maven.lenni0451.net/" + (project.version.endsWith("SNAPSHOT") ? "snapshots" : "releases") credentials(PasswordCredentials) authentication { diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..7ddcf82 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,8 @@ +# gradle +org.gradle.jvmargs=-Xmx8G +org.gradle.parallel=true + +# project +maven_name=Classic4J +maven_version=2.0.2-SNAPSHOT +maven_group=de.florianmichael diff --git a/jitpack.yml b/jitpack.yml index f29a667..320011e 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,5 +1,6 @@ -jdk: - - openjdk17 +# Deploys the latest stable JDK available and sets it to default without having to manually specify it here, +# Which includes using temurin as the distribution. before_install: - - sdk install java 17.0.1-open - - sdk use java 17.0.1-open \ No newline at end of file + - curl -s "https://get.sdkman.io" | bash + - source ~/.sdkman/bin/sdkman-init.sh + - sdk install java