Skip to content

Commit f8b9308

Browse files
committed
feat: Generate GraalVM native compatible reflect config resources
1 parent 1e9f03c commit f8b9308

File tree

183 files changed

+377
-313
lines changed

Some content is hidden

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

183 files changed

+377
-313
lines changed

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ subprojects { subproj ->
119119
compileOnly 'org.osgi:osgi.core:8.0.0'
120120
compileOnly 'org.osgi:org.osgi.service.component.annotations:1.5.1'
121121
testImplementation 'junit:junit:4.13.2'
122+
123+
compileOnly project(':ikonli-nativeimage-annotations')
124+
annotationProcessor project(':ikonli-nativeimage-processor')
122125
}
123126
}
124127

core/ikonli-core/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
requires java.logging;
2222
requires static org.osgi.service.component.annotations;
2323
requires static osgi.core;
24+
requires static org.kordamp.ikonli.infra.nativeimage.annotations;
2425

2526
uses org.kordamp.ikonli.IkonHandler;
2627

core/ikonli-core/src/main/java/org/kordamp/ikonli/IkonliIkonProvider.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
*/
1818
package org.kordamp.ikonli;
1919

20-
import org.kordamp.jipsy.annotations.ServiceProviderFor;
21-
import org.osgi.service.component.annotations.Component;
22-
2320
/**
2421
* @author Andres Almiray
2522
*/
26-
@ServiceProviderFor(IkonProvider.class)
27-
@Component(service = IkonProvider.class)
23+
@org.kordamp.jipsy.annotations.ServiceProviderFor(IkonProvider.class)
24+
@org.osgi.service.component.annotations.Component(service = IkonProvider.class)
25+
@org.kordamp.ikonli.infra.nativeimage.annotations.NativeImage
2826
public class IkonliIkonProvider implements IkonProvider<Ikonli> {
2927
@Override
3028
public Class<Ikonli> getIkon() {

core/ikonli-javafx/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@
2424
requires javafx.graphics;
2525
requires javafx.controls;
2626
requires static org.osgi.service.component.annotations;
27+
requires static org.kordamp.ikonli.infra.nativeimage.annotations;
2728
}

core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/FontIcon.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
/**
4848
* @author Andres Almiray
4949
*/
50+
@org.kordamp.ikonli.infra.nativeimage.annotations.NativeImage
5051
public class FontIcon extends Text implements Icon {
5152
private static final double EPSILON = 0.000001d;
5253
protected StyleableIntegerProperty iconSize;

core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/JavaFXFontLoader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020
import javafx.scene.text.Font;
2121
import org.kordamp.ikonli.FontLoader;
2222
import org.kordamp.ikonli.IkonHandler;
23-
import org.osgi.service.component.annotations.Component;
2423

2524
import java.util.Map;
2625
import java.util.concurrent.ConcurrentHashMap;
2726

28-
@Component(service = FontLoader.class)
27+
@org.osgi.service.component.annotations.Component(service = FontLoader.class)
2928
public class JavaFXFontLoader implements FontLoader {
3029
private static final Map<String, Font> FONTS = new ConcurrentHashMap<>();
3130

core/ikonli-swing/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@
2222

2323
requires java.desktop;
2424
requires static org.osgi.service.component.annotations;
25+
requires static org.kordamp.ikonli.infra.nativeimage.annotations;
2526
}

core/ikonli-swing/src/main/java/org/kordamp/ikonli/swing/FontIcon.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
/**
3838
* @author Andres Almiray
3939
*/
40+
@org.kordamp.ikonli.infra.nativeimage.annotations.NativeImage
4041
public class FontIcon implements Icon {
4142
private static final Object LOCK = new Object[0];
4243

core/ikonli-swing/src/main/java/org/kordamp/ikonli/swing/SwingFontLoader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.kordamp.ikonli.FontLoader;
2121
import org.kordamp.ikonli.IkonHandler;
22-
import org.osgi.service.component.annotations.Component;
2322

2423
import java.awt.Font;
2524
import java.awt.FontFormatException;
@@ -29,7 +28,7 @@
2928
import java.util.Map;
3029
import java.util.concurrent.ConcurrentHashMap;
3130

32-
@Component(service = FontLoader.class)
31+
@org.osgi.service.component.annotations.Component(service = FontLoader.class)
3332
public class SwingFontLoader implements FontLoader {
3433
private static final Map<String, Font> FONTS = new ConcurrentHashMap<>();
3534

icon-packs/ikonli-antdesignicons-pack/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
requires org.kordamp.ikonli.core;
2020
requires static org.kordamp.jipsy.annotations;
2121
requires static org.osgi.service.component.annotations;
22+
requires static org.kordamp.ikonli.infra.nativeimage.annotations;
2223
exports org.kordamp.ikonli.antdesignicons;
2324

2425
provides org.kordamp.ikonli.IkonHandler

0 commit comments

Comments
 (0)