Skip to content

Fixed kotlin native interfaces and removed reflection nonsense #4728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shai-almog merged 1 commit into from
Apr 9, 2026
Merged

Fixed kotlin native interfaces and removed reflection nonsense #4728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 44 additions & 46 deletions ...n/codenameone-maven-plugin/src/main/java/com/codename1/builders/AndroidGradleBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3605,6 +3605,24 @@ public void usesClassMethod(String cls, String method) {
gradleDependency = "classpath 'com.android.tools.build:gradle:8.1.0'\n";
}
}
boolean hasKotlinSources = hasSourceFileWithExtension(new File(projectDir, "src/main/java"), ".kt");
String kotlinVersion = request.getArg("requireKotlinStdlib", "").trim();
if (hasKotlinSources && kotlinVersion.length() == 0) {
kotlinVersion = useGradle8 ? "1.9.22" : "1.7.22";
}
String kotlinPluginApply = "";
String kotlinRuntimeDependency = "";
if (hasKotlinSources) {
if (!request.getArg("android.topDependency", "").contains("kotlin-gradle-plugin")) {
gradleDependency += "classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:" + kotlinVersion + "'\n";
}
kotlinPluginApply = "apply plugin: 'kotlin-android'\n";
String gradleDeps = request.getArg("android.gradleDep", "");
if (!additionalDependencies.contains("org.jetbrains.kotlin:kotlin-stdlib")
&& !gradleDeps.contains("org.jetbrains.kotlin:kotlin-stdlib")) {
kotlinRuntimeDependency = " implementation 'org.jetbrains.kotlin:kotlin-stdlib:" + kotlinVersion + "'\n";
}
}
gradleDependency += request.getArg("android.topDependency", "");

String compileSdkVersion = "'android-21'";
Expand Down Expand Up @@ -3743,6 +3761,7 @@ public void usesClassMethod(String cls, String method) {
}

String gradleProps = "apply plugin: 'com.android.application'\n"
+ kotlinPluginApply
+ request.getArg("android.gradlePlugin", "")
+ "\n"
+ "buildscript {\n"
Expand Down Expand Up @@ -3826,6 +3845,7 @@ public void usesClassMethod(String cls, String method) {
+ "dependencies {\n"
+ " "+compile+" fileTree(dir: 'libs', include: ['*.jar'])\n"
+ request.getArg("android.supportv4Dep",supportV4Default) + "\n"
+ kotlinRuntimeDependency
+ addNewlineIfMissing(additionalDependencies)
+ addNewlineIfMissing(request.getArg("android.gradleDep", ""))
+ addNewlineIfMissing(aarDependencies)
Expand Down Expand Up @@ -3994,27 +4014,7 @@ protected String registerNativeImplementationsAndCreateStubs(ClassLoader parentC
String javaImplSourceFile = "package " + currentNative.getPackage().getName() + ";\n\n"
+ "import com.codename1.ui.PeerComponent;\n\n"
+ "public class " + currentNative.getSimpleName() + "Stub implements " + currentNative.getSimpleName() + "{\n"
+ " private final Object impl = createImpl();\n\n"
+ " private static Object createImpl() {\n"
+ " try {\n"
+ " return Class.forName(\"" + currentNative.getName() + getImplSuffix() + "\").newInstance();\n"
+ " } catch (Throwable t) {\n"
+ " throw new RuntimeException(\"Failed to instantiate native implementation for " + currentNative.getName() + "\", t);\n"
+ " }\n"
+ " }\n\n"
+ " private Object __cn1Invoke(String methodName, Object[] args) {\n"
+ " try {\n"
+ " java.lang.reflect.Method[] methods = impl.getClass().getMethods();\n"
+ " for (java.lang.reflect.Method method : methods) {\n"
+ " if (method.getName().equals(methodName) && method.getParameterTypes().length == args.length) {\n"
+ " return method.invoke(impl, args);\n"
+ " }\n"
+ " }\n"
+ " throw new RuntimeException(methodName + \" with \" + args.length + \" args\");\n"
+ " } catch (Throwable t) {\n"
+ " throw new RuntimeException(\"Failed to invoke native method \" + methodName, t);\n"
+ " }\n"
+ " }\n\n";
+ " private " + currentNative.getSimpleName() + getImplSuffix() + " impl = new " + currentNative.getSimpleName() + getImplSuffix() + "();\n\n";

for (Method m : currentNative.getMethods()) {
String name = m.getName();
Expand Down Expand Up @@ -4042,34 +4042,13 @@ protected String registerNativeImplementationsAndCreateStubs(ClassLoader parentC
}
}
javaImplSourceFile += ") {\n";
String invocationExpression = "__cn1Invoke(\"" + name + "\", new Object[]{" + args + "})";
if (Void.class == returnType || Void.TYPE == returnType) {
javaImplSourceFile += " " + invocationExpression + ";\n }\n\n";
javaImplSourceFile += " impl." + name + "(" + args + ");\n }\n\n";
} else {
if (returnType.getName().equals("com.codename1.ui.PeerComponent")) {
javaImplSourceFile += " return " + generatePeerComponentCreationCode(invocationExpression) + ";\n }\n\n";
} else if (returnType.isPrimitive()) {
if (returnType == Boolean.TYPE) {
javaImplSourceFile += " return ((Boolean)" + invocationExpression + ").booleanValue();\n }\n\n";
} else if (returnType == Integer.TYPE) {
javaImplSourceFile += " return ((Integer)" + invocationExpression + ").intValue();\n }\n\n";
} else if (returnType == Long.TYPE) {
javaImplSourceFile += " return ((Long)" + invocationExpression + ").longValue();\n }\n\n";
} else if (returnType == Byte.TYPE) {
javaImplSourceFile += " return ((Byte)" + invocationExpression + ").byteValue();\n }\n\n";
} else if (returnType == Short.TYPE) {
javaImplSourceFile += " return ((Short)" + invocationExpression + ").shortValue();\n }\n\n";
} else if (returnType == Character.TYPE) {
javaImplSourceFile += " return ((Character)" + invocationExpression + ").charValue();\n }\n\n";
} else if (returnType == Float.TYPE) {
javaImplSourceFile += " return ((Float)" + invocationExpression + ").floatValue();\n }\n\n";
} else if (returnType == Double.TYPE) {
javaImplSourceFile += " return ((Double)" + invocationExpression + ").doubleValue();\n }\n\n";
} else {
javaImplSourceFile += " return (" + returnType.getSimpleName() + ")" + invocationExpression + ";\n }\n\n";
}
javaImplSourceFile += " return " + generatePeerComponentCreationCode("impl." + name + "(" + args + ")") + ";\n }\n\n";
} else {
javaImplSourceFile += " return (" + returnType.getSimpleName() + ")" + invocationExpression + ";\n }\n\n";
javaImplSourceFile += " return impl." + name + "(" + args + ");\n }\n\n";
}
}
}
Expand Down Expand Up @@ -4412,7 +4391,7 @@ public void unzip(InputStream source, File classesDir, File resDir, File sourceD
if (entryName.endsWith(".class")) {
destFile = new File(classesDir, entryName);
} else {
if (entryName.endsWith(".java") || entryName.endsWith(".m") || entryName.endsWith(".h")) {
if (entryName.endsWith(".java") || entryName.endsWith(".kt") || entryName.endsWith(".swift") || entryName.endsWith(".m") || entryName.endsWith(".h")) {
destFile = new File(sourceDir, entryName);
} else {
if (entryName.endsWith(".jar") || entryName.endsWith(".a") || entryName.endsWith(".dylib") || entryName.endsWith(".andlib") || entryName.endsWith(".aar")) {
Expand Down Expand Up @@ -4766,6 +4745,25 @@ private Integer parseSdkInt(String value) {
}
}

private boolean hasSourceFileWithExtension(File dir, String extension) {
if (dir == null || !dir.exists()) {
return false;
}
if (dir.isFile()) {
return dir.getName().endsWith(extension);
}
File[] children = dir.listFiles();
if (children == null) {
return false;
}
for (File child : children) {
if (hasSourceFileWithExtension(child, extension)) {
return true;
}
}
return false;
}

private void stripKotlin(File dummyClassesDir) {
String[] skipDirectories = new String[] {
"org" + File.separator + "jetbrains" + File.separator + "annotations",
Expand Down
4 changes: 2 additions & 2 deletions maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/Executor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ private void copyDir(File dir, File classesDir, File resDir, File sourceDir, Fil
destFile = new File(classesDir, fileName);
}
} else {
if (fileName.endsWith(".java") || fileName.endsWith(".m") || fileName.endsWith(".h") || fileName.endsWith(".cs")) {
if (fileName.endsWith(".java") || fileName.endsWith(".kt") || fileName.endsWith(".swift") || fileName.endsWith(".m") || fileName.endsWith(".h") || fileName.endsWith(".cs")) {
destFile = new File(sourceDir, fileName);
} else {
if (fileName.endsWith(".jar") || fileName.endsWith(".a") || fileName.endsWith(".dylib")) {
Expand Down Expand Up @@ -1319,7 +1319,7 @@ public void unzip(InputStream source, File classesDir, File resDir, File sourceD
destFile = new File(classesDir, entryName);
}
} else {
if (entryName.endsWith(".java") || entryName.endsWith(".m") || entryName.endsWith(".h") || entryName.endsWith(".cs")) {
if (entryName.endsWith(".java") || entryName.endsWith(".kt") || entryName.endsWith(".swift") || entryName.endsWith(".m") || entryName.endsWith(".h") || entryName.endsWith(".cs")) {
destFile = new File(sourceDir, entryName);
} else {
if (entryName.endsWith(".jar") || entryName.endsWith(".a") || entryName.endsWith(".dylib") || entryName.endsWith(".andlib") || entryName.endsWith(".aar") || entryName.endsWith(dll)) {
Expand Down
Loading