Merge branch 'non-modular' of https://github.com/danielpeintner/Java11Test into non-modular

danielpeintner · danielpeintner · commit 7b7f366657d1 · 2021-09-02T15:24:37.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,16 @@
+.gradle
+.idea/
+.DS_Store
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
diff --git a/build.gradle b/build.gradle
@@ -102,7 +102,7 @@ runtime {
                 '--copyright', company,
         ]
         if(os.macOsX) {
-            imageOptions = ['--icon', 'src/main/deploy/package/macosx/hello.icns']
+            imageOptions = ['--mac-sign', '--icon', 'src/main/deploy/package/macosx/hello.icns']
             installerOptions += [
                 // '--mac-sign',
                 // '--mac-signing-key-user-name', System.getenv('SIGNING_KEY_USER_NAME'),

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ runtime {`
`102`	`102`	`'--copyright', company,`
`103`	`103`	`]`
`104`	`104`	`if(os.macOsX) {`
`105`		`- imageOptions = ['--icon', 'src/main/deploy/package/macosx/hello.icns']`
	`105`	`+ imageOptions = ['--mac-sign', '--icon', 'src/main/deploy/package/macosx/hello.icns']`
`106`	`106`	`installerOptions += [`
`107`	`107`	`// '--mac-sign',`
`108`	`108`	`// '--mac-signing-key-user-name', System.getenv('SIGNING_KEY_USER_NAME'),`