From c6e9eebd93013662271a76a486668d7e1f2725fd Mon Sep 17 00:00:00 2001 From: weisj Date: Tue, 14 Jan 2020 18:02:03 +0100 Subject: [PATCH] Merge remote-tracking branch 'origin/master' Signed-off-by: weisj # Conflicts: # .github/workflows/gradle.yml --- .github/workflows/gradle.yml | 2 +- build.gradle | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 03be06ad..5099afec 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -14,4 +14,4 @@ jobs: with: java-version: 1.11 - name: Build with Gradle - run: ./gradlew build -PdeployRepoUrl=${{ secrets.deployRepoUrl }} -PdeployRepoUsername=${{ secrets.deployRepoUsername }} -PdeployRepoPassword=${{ secrets.deployRepoPassword }} -PsigningKeyId=${{ secrets.SIGNING_KEY_ID }} -PsigningPassword=${{ secrets.SIGNING_PASSWORD }} -PsigningKey=${{ secrets.SIGNING_KEY }} + run: ./gradle build -PdeployRepoUrl=${{secrets.deployRepoUrl}} -PdeployRepoUsername=${{secrets.deployRepoUsername}} -PdeployRepoPassword=${{secrets.deployRepoPassword}} -PsigningKeyId=${{secrets.SIGNING_KEY_ID}} -PsigningPassword=${{secrets.SIGNING_PASSWORD}} -PsigningKey=${{secrets.SIGNING_KEY}} diff --git a/build.gradle b/build.gradle index fc3ec6ae..c152ffc0 100644 --- a/build.gradle +++ b/build.gradle @@ -153,7 +153,6 @@ model { println "Building on OS: " + System.properties['os.name'] println "Using JDK: " + System.properties['java.home'] -println signingKey.replaceAll("#", "\n") compileJava { sourceCompatibility = 8