From 881b0480e49c11294d0edae1d454ea3b180b56d7 Mon Sep 17 00:00:00 2001 From: Matt Worzala Date: Sat, 21 Aug 2021 22:35:43 -0400 Subject: [PATCH 1/5] bump gradle --- .gitignore | 25 +----------------------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 57c1a42..1214638 100644 --- a/.gitignore +++ b/.gitignore @@ -21,27 +21,7 @@ gradle-app.setting # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries +.idea # Gradle and Maven with auto-import # When using Gradle or Maven with auto-import, you should exclude module files, @@ -59,9 +39,6 @@ gradle-app.setting # CMake cmake-build-*/ -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - # File-based project format *.iws diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b4429..f371643 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 4abbf9dac96c713d33d6e2aa6d23ff563fd183f2 Mon Sep 17 00:00:00 2001 From: Matt Worzala Date: Sat, 21 Aug 2021 22:40:55 -0400 Subject: [PATCH 2/5] add central publishing --- build.gradle | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dfbcd56..e0c5d4a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,18 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.4.10' + + id 'maven-publish' + id 'signing' + id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' } + group = 'net.minestom' -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() } + dependencies { implementation 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:3.1.4' testImplementation( @@ -19,6 +25,69 @@ dependencies { test { useJUnitPlatform() } + compileKotlin { kotlinOptions.jvmTarget = '1.8' +} + +task javadocJar(type: Jar) { + from javadoc + classifier = 'javadoc' +} + +task sourcesJar(type: Jar) { + from sourceSets.main.allSource +} + +artifacts { + archives sourcesJar, javadocJar +} + +// Publishing + +publishing { + publications { + release(MavenPublication) { + from project.components.java + artifact javadocJar + artifact sourcesJar + + pom { + name = 'dependencygetter' + description = 'Abstraction layer over dependencies. Made with Minestom extensions in mind.' + url = 'https://github.com/Minestom/DependencyGetter' + licenses { + license { + name = 'MIT License' + url = 'https://github.com/Minestom/DependencyGetter/blob/master/LICENSE.md' + } + } + + scm { + connection = 'scm:git:github.com/Minestom/DependencyGetter.git' + developerConnection = 'scm:git:ssh://github.com/Minestom/DependencyGetter.git' + url = 'https://github.com/Minestom/DependencyGetter/tree/master' + } + + developers { + developer { + id = 'minestom' + name = 'Minestom Contributors' + email = 'communications@minestom.net' + } + } + } + } + } +} + +// Signing + +signing { + if (System.env['CI'] != null) { + def signingKey = System.env['SIGNING_KEY'] + def signingPassword = System.env['SIGNING_PASSWORD'] + useInMemoryPgpKeys(signingKey, signingPassword) + } + sign publishing.publications } \ No newline at end of file From d1bd652daa2b4d7823c2c67ba814203116b2da1f Mon Sep 17 00:00:00 2001 From: Matt Worzala Date: Sat, 21 Aug 2021 22:43:28 -0400 Subject: [PATCH 3/5] add workflow --- .github/workflows/deploy.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/deploy.yaml diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml new file mode 100644 index 0000000..55671dd --- /dev/null +++ b/.github/workflows/deploy.yaml @@ -0,0 +1,23 @@ +name: Deploy + +on: + workflow_dispatch: + +jobs: + deploy: + runs-on: ubuntu-latest + env: + sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} + sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} + SIGNING_KEY: ${{ secrets.P_KEY_ARMORED }} + SIGNING_PASSWORD: ${{ secrets.P_KEY_PASSPHRASE }} + + steps: + - uses: actions/checkout@v2 + - name: Setup JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Deploy + run: ./gradlew publishAllPublicationsToSonatypeRepository closeAndReleaseSonatypeStagingRepository \ No newline at end of file From 23362e22a12599cd8fa9034fd9ffd588806fce56 Mon Sep 17 00:00:00 2001 From: Matt Worzala Date: Sat, 21 Aug 2021 22:44:31 -0400 Subject: [PATCH 4/5] add nexus publish block --- build.gradle | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/build.gradle b/build.gradle index e0c5d4a..7d08aa7 100644 --- a/build.gradle +++ b/build.gradle @@ -81,6 +81,18 @@ publishing { } } +nexusPublishing { + repositories { + sonatype { + nexusUrl = uri("https://s01.oss.sonatype.org/service/local/") + snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") + + username = System.getenv("sonatypeUsername") ?: hasProperty("sonatypeUsername") ? sonatypeUsername : '' + password = System.getenv("sonatypePassword") ?: hasProperty("sonatypePassword") ? sonatypePassword : '' + } + } +} + // Signing signing { From 8b571eb0299cf8fab49cacdd66cddb3e4973c486 Mon Sep 17 00:00:00 2001 From: Matt Worzala Date: Sat, 21 Aug 2021 22:47:45 -0400 Subject: [PATCH 5/5] change minestom contact email --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7d08aa7..e142132 100644 --- a/build.gradle +++ b/build.gradle @@ -73,7 +73,7 @@ publishing { developer { id = 'minestom' name = 'Minestom Contributors' - email = 'communications@minestom.net' + email = 'contact@minestom.net' } } }