diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..de20cfb --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,25 @@ +name: CI + +on: + pull_request: + branches: [main] + +jobs: + test: + name: Build and Test + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Run Build + run: ./gradlew build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..670d612 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,31 @@ +name: Publish + +on: + push: + branches: + - main + +jobs: + publish: + name: Release build and publish + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + + - name: Build + run: ./gradlew build + + - name: Publish to MavenCentral + run: ./gradlew dashx:publishToMavenCentral dashx-spring-boot-starter:publishToMavenCentral + env: + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }} diff --git a/.gitignore b/.gitignore index 8b696f8..a570c51 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ out/ .mtj.tmp/ # Package Files # -*.jar *.war *.nar *.ear diff --git a/build.gradle b/build.gradle index 4c21387..1eadc13 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,3 @@ plugins { - id 'com.vanniktech.maven.publish' version '0.31.0' + id 'com.vanniktech.maven.publish' version '0.36.0' } diff --git a/dashx-spring-boot-starter/build.gradle b/dashx-spring-boot-starter/build.gradle index ca99c96..4bd847b 100644 --- a/dashx-spring-boot-starter/build.gradle +++ b/dashx-spring-boot-starter/build.gradle @@ -1,9 +1,6 @@ -import com.vanniktech.maven.publish.SonatypeHost - plugins { id 'java-library' - id 'com.vanniktech.maven.publish' version '0.31.0' - id 'signing' + id 'com.vanniktech.maven.publish' version '0.36.0' } def version = libs.versions.dashx.get() @@ -34,7 +31,9 @@ tasks.named('test') { mavenPublishing { coordinates(group, artifactId, version) - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL,true) + publishToMavenCentral(true) + + signAllPublications() pom { name = 'DashX Spring Boot Starter' @@ -62,8 +61,3 @@ mavenPublishing { } } } - -signing { - useGpgCmd() - sign publishing.publications -} diff --git a/dashx/build.gradle b/dashx/build.gradle index 6621d65..92a7dda 100644 --- a/dashx/build.gradle +++ b/dashx/build.gradle @@ -1,10 +1,7 @@ -import com.vanniktech.maven.publish.SonatypeHost - plugins { id 'java-library' id 'com.netflix.dgs.codegen' version '8.0.2' - id 'com.vanniktech.maven.publish' version '0.31.0' - id 'signing' + id 'com.vanniktech.maven.publish' version '0.36.0' } def version = libs.versions.dashx.get() @@ -56,7 +53,9 @@ generateJava { mavenPublishing { coordinates(group, artifactId, version) - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true) + publishToMavenCentral(true) + + signAllPublications() pom { name = 'DashX Java SDK' @@ -84,8 +83,3 @@ mavenPublishing { } } } - -signing { - useGpgCmd() - sign publishing.publications -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 509e790..c432452 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format [versions] -dashx = "1.4.0" +dashx = "1.4.1" group = "com.dashx" junit-jupiter = "5.11.3" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..9bbc975 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ