Skip to content

Commit 957b61c

Browse files
committed
Jetpack Compose Compatibility
Calling Kotlin code while being backwards compatible with the Ant based build-system
1 parent 3cdfaa2 commit 957b61c

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ sourceSets{
2525
main{
2626
java{
2727
srcDirs("src")
28+
exclude("**/*Kt.java")
2829
}
2930
kotlin{
3031
srcDirs("src")
32+
exclude("**/*Kt.java")
3133
}
3234
resources{
3335
srcDirs("src","../build/shared/")

app/src/processing/app/Mode.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
import processing.app.ui.Toolkit;
4242
import processing.core.PApplet;
4343

44+
import static processing.app.contrib.ui.ContributionManagerKt.openContributionsManager;
45+
4446

4547
public abstract class Mode {
4648
protected Base base;
@@ -501,7 +503,7 @@ public void rebuildImportMenu() { //JMenu importMenu) {
501503
}
502504

503505
JMenuItem manageLibs = new JMenuItem(Language.text("menu.library.manage_libraries"));
504-
manageLibs.addActionListener(e -> ContributionManager.openLibraries());
506+
manageLibs.addActionListener(e -> openContributionsManager());
505507
importMenu.add(manageLibs);
506508
importMenu.addSeparator();
507509

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package processing.app.contrib.ui;
2+
3+
import processing.app.contrib.ContributionManager;
4+
5+
public final class ContributionManagerKt {
6+
public static void openContributionsManager() {
7+
ContributionManager.openLibraries();
8+
}
9+
10+
}

0 commit comments

Comments
 (0)