Browse Source

Merge remote-tracking branch 'origin/master'

Signed-off-by: weisj <weisj@arcor.de>

# Conflicts:
#	.github/workflows/gradle.yml
pull/15/head
weisj 5 years ago
parent
commit
c6e9eebd93
  1. 2
      .github/workflows/gradle.yml
  2. 1
      build.gradle

2
.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}}

1
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

Loading…
Cancel
Save