Skip to content

Commit f5e5eac

Browse files
committed
[build] Refactor duplication
1 parent 12f9506 commit f5e5eac

File tree

62 files changed

+175
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+175
-388
lines changed

apps/sampler-javafx/sampler-javafx.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ plugins {
1919
id 'application'
2020
}
2121

22-
mainClassName = 'org.kordamp.ikonli.sampler.javafx/org.kordamp.ikonli.sampler.javafx.Sampler'
22+
application {
23+
mainModule = 'org.kordamp.ikonli.sampler.javafx'
24+
mainClass = 'org.kordamp.ikonli.sampler.javafx.Sampler'
25+
}
2326

2427
dependencies {
2528
implementation project(':ikonli-core')

apps/sampler-swing/sampler-swing.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
*/
1818
apply plugin: 'application'
1919

20-
mainClassName = 'org.kordamp.ikonli.sampler.swing/org.kordamp.ikonli.sampler.swing.Sampler'
20+
application {
21+
mainModule = 'org.kordamp.ikonli.sampler.swing'
22+
mainClass = 'org.kordamp.ikonli.sampler.swing.Sampler'
23+
}
2124

2225
dependencies {
2326
implementation project(':ikonli-core')

build.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ subprojects { subproj ->
9191
testImplementation 'junit:junit:4.13.2'
9292
}
9393

94+
tasks.named('compileJava') {
95+
options.javaModuleVersion = provider { project.version }
96+
}
97+
9498
license {
9599
mapping {
96100
fxml = 'XML_STYLE'
@@ -106,6 +110,14 @@ subprojects { subproj ->
106110
exclude '**/*.txt'
107111
}
108112
}
113+
114+
if (subproj.name.endsWith('-pack')) {
115+
dependencies {
116+
api project(':ikonli-core')
117+
compileOnly "org.kordamp.jipsy:jipsy-annotations:${jipsyVersion}"
118+
annotationProcessor "org.kordamp.jipsy:jipsy-processor:${jipsyVersion}"
119+
}
120+
}
109121
}
110122

111123
project.rootProject.gradle.addBuildListener(new BuildAdapter() {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ kordampBuildVersion = 2.5.0
3232
gitPluginVersion = 3.0.0
3333
modularityPluginVersion = 1.8.10
3434
jlinkPluginVersion = 2.24.4
35-
jreleaserPluginVersion = 0.9.1
35+
jreleaserPluginVersion = 1.0.0-M3
3636
miglayoutVersion = 11.0
3737

3838
antdesigniconsVersion = 4.0.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 153 additions & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)