Skip to content

Commit 1ba30be

Browse files
triniwiztriniwiz
committed
fix: JvmName annotation & Kotlin building from App Resources
#1682
1 parent d9dc56f commit 1ba30be

25 files changed

+374
-111
lines changed

‎test-app/app/build.gradle

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ import java.util.jar.JarEntry
3535
import java.util.jar.JarFile
3636

3737
import static org.gradle.internal.logging.text.StyledTextOutput.Style
38+
import java.util.stream.Collectors;
39+
import java.util.stream.Stream;
40+
3841

3942
apply plugin: "com.android.application"
4043
apply from: "gradle-helpers/BuildToolTask.gradle"
@@ -77,6 +80,7 @@ def OUTPUT_JAVA_DIR = "$projectDir/src/main/java"
7780
def MDG_OUTPUT_DIR = "mdg-output-dir.txt"
7881
def MDG_JAVA_DEPENDENCIES = "mdg-java-dependencies.txt"
7982
def METADATA_OUT_PATH = "$projectDir/src/main/assets/metadata"
83+
def METADATA_JAVA_OUT = "mdg-java-out.txt"
8084

8185
// paths to jar libraries
8286
def pluginsJarLibraries = new LinkedList<String>()
@@ -461,6 +465,13 @@ tasks.whenTaskAdded({ DefaultTask currentTask ->
461465
currentTask.dependsOn(runSbg)
462466
currentTask.finalizedBy(buildMetadata)
463467
}
468+
469+
470+
if (currentTask =~ /compile.+Kotlin.+/) {
471+
currentTask.dependsOn(runSbg)
472+
currentTask.finalizedBy(buildMetadata)
473+
}
474+
464475
if (currentTask =~ /merge.*Assets/) {
465476
currentTask.dependsOn(buildMetadata)
466477
}
@@ -706,6 +717,23 @@ task copyMetadata {
706717
}
707718
}
708719

720+
def listf(String directoryName, ArrayList<File> store) {
721+
def directory = new File(directoryName);
722+
723+
def resultList = new ArrayList<File>();
724+
725+
def fList = directory.listFiles();
726+
resultList.addAll(Arrays.asList(fList));
727+
for (File file : fList) {
728+
if (file.isFile()) {
729+
store.add(file)
730+
} else if (file.isDirectory()) {
731+
resultList.addAll(listf(file.getAbsolutePath(), store))
732+
}
733+
}
734+
return resultList
735+
}
736+
709737
task buildMetadata(type: BuildToolTask) {
710738
if (!findProject(':android-metadata-generator').is(null)) {
711739
dependsOn ':android-metadata-generator:jar'
@@ -767,6 +795,19 @@ task buildMetadata(type: BuildToolTask) {
767795
}
768796
}
769797

798+
def store = new ArrayList<File>()
799+
for (String dir: generatedClasses){
800+
listf(dir, store)
801+
}
802+
803+
804+
new File("$BUILD_TOOLS_PATH/$METADATA_JAVA_OUT").withWriter { out ->
805+
store.each {
806+
out.println it.absolutePath
807+
}
808+
}
809+
810+
770811
new File("$BUILD_TOOLS_PATH/$MDG_OUTPUT_DIR").withWriter { out ->
771812
out.println "$METADATA_OUT_PATH"
772813
}
@@ -890,6 +931,7 @@ task cleanSbg(type: Delete) {
890931
"$BUILD_TOOLS_PATH/$SBG_BINDINGS_NAME",
891932
"$BUILD_TOOLS_PATH/$SBG_INPUT_FILE",
892933
"$BUILD_TOOLS_PATH/$SBG_OUTPUT_FILE",
934+
"$BUILD_TOOLS_PATH/$METADATA_JAVA_OUT",
893935
"$OUTPUT_JAVA_DIR/com/tns/gen"
894936
}
895937

‎test-app/app/src/main/assets/app/mainpage.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,6 @@ require("./tests/kotlin/objects/testObjectsSupport");
6464
require("./tests/kotlin/functions/testTopLevelFunctionsSupport");
6565
require("./tests/kotlin/extensions/testExtensionFunctionsSupport");
6666
require("./tests/kotlin/enums/testEnumsSupport");
67-
require("./tests/kotlin/access/testInternalLanguageFeaturesSupport");
67+
require("./tests/kotlin/access/testInternalLanguageFeaturesSupport");
68+
require("./tests/testPackagePrivate");
69+
require("./tests/kotlin/properties/testPropertiesSupport.js")

‎test-app/app/src/main/assets/app/tests/kotlin/properties/testPropertiesSupport.js

Lines changed: 94 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,97 @@
11
describe("Tests Kotlin properties support", function () {
2-
it("Test Kotlin JvmField properties should work", function () {
3-
var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
4-
5-
expect(kotlinClass.jvmField).toBe(0);
6-
7-
kotlinClass.jvmField = 1;
8-
9-
expect(kotlinClass.jvmField).toBe(1);
10-
});
11-
12-
13-
it("Test Kotlin public properties should work", function () {
14-
var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
15-
16-
expect(kotlinClass.immutableProperty).toBe("someImmutableProperty");
17-
try{
18-
kotlinClass.immutableProperty = "SHOULD NOT WORK";
19-
fail();
20-
} catch{}
21-
22-
expect(kotlinClass.mutableProperty).toBe("someMutableProperty");
23-
kotlinClass.mutableProperty = "someOtherMutableProperty";
24-
expect(kotlinClass.mutableProperty).toBe("someOtherMutableProperty");
25-
});
26-
27-
it("Test Kotlin private properties should not work", function () {
28-
var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
29-
30-
expect(kotlinClass.privateMutableProperty).toBe(undefined);
31-
expect(kotlinClass.privateImmutableProperty).toBe(undefined);
32-
});
33-
34-
it("Test Kotlin internal properties should not work", function () {
35-
var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
36-
37-
expect(kotlinClass.internalMutableProperty).toBe(undefined);
38-
expect(kotlinClass.internalImmutableProperty).toBe(undefined);
39-
});
40-
41-
it("Test Kotlin protected properties should work", function () {
42-
var kotlinClass = new (com.tns.tests.kotlin.properties.KotlinClassWithProperties.extend({
43-
getProtectedMutableProperty: function(){
44-
expect(this.super.protectedMutableProperty).toBe("someProtectedMutableProperty");
45-
this.super.protectedMutableProperty = "someOtherProtectedMutableProperty";
46-
expect(this.super.protectedMutableProperty).toBe("someOtherProtectedMutableProperty");
47-
},
48-
getProtectedImmutableProperty: function(){
49-
expect(this.super.protectedImmutableProperty).toBe("someProtectedImmutableProperty");
50-
try{
51-
this.super.protectedImmutableProperty = "SHOULD NOT WORK";
52-
fail();
53-
} catch {}
54-
}
55-
}))();
56-
57-
kotlinClass.getProtectedMutableProperty();
58-
kotlinClass.getProtectedImmutableProperty();
59-
});
60-
61-
62-
it("Test Kotlin property private should not work", function () {
63-
var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
64-
try{
65-
kotlinClass.privateSetterProperty = "SHOULD NOT WORK";
66-
fail();
67-
} catch {}
68-
});
69-
70-
it("Test Kotlin boolean property should work", function () {
71-
var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
72-
73-
expect(kotlinClass.isMutableBooleanProperty()).toBe(true);
74-
kotlinClass.setMutableBooleanProperty(false);
75-
expect(kotlinClass.isMutableBooleanProperty()).toBe(false);
76-
});
77-
78-
it("Test Kotlin property with complext type should work", function () {
79-
var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
80-
81-
expect(kotlinClass.mutablePropertyWithComplexType.someString).toBe("test");
82-
83-
var simpleObject = new com.tns.tests.kotlin.SimpleKotlinObject();
84-
kotlinClass.mutablePropertyWithComplexType = simpleObject;
85-
expect(kotlinClass.mutablePropertyWithComplexType.equals(simpleObject)).toBe(true);
2+
// it("Test Kotlin JvmField properties should work", function () {
3+
// var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
4+
//
5+
// expect(kotlinClass.jvmField).toBe(0);
6+
//
7+
// kotlinClass.jvmField = 1;
8+
//
9+
// expect(kotlinClass.jvmField).toBe(1);
10+
// });
11+
//
12+
//
13+
// it("Test Kotlin public properties should work", function () {
14+
// var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
15+
//
16+
// expect(kotlinClass.immutableProperty).toBe("someImmutableProperty");
17+
// try{
18+
// kotlinClass.immutableProperty = "SHOULD NOT WORK";
19+
// fail();
20+
// } catch{}
21+
//
22+
// expect(kotlinClass.mutableProperty).toBe("someMutableProperty");
23+
// kotlinClass.mutableProperty = "someOtherMutableProperty";
24+
// expect(kotlinClass.mutableProperty).toBe("someOtherMutableProperty");
25+
// });
26+
//
27+
// it("Test Kotlin private properties should not work", function () {
28+
// var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
29+
//
30+
// expect(kotlinClass.privateMutableProperty).toBe(undefined);
31+
// expect(kotlinClass.privateImmutableProperty).toBe(undefined);
32+
// });
33+
//
34+
// it("Test Kotlin internal properties should not work", function () {
35+
// var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
36+
//
37+
// expect(kotlinClass.internalMutableProperty).toBe(undefined);
38+
// expect(kotlinClass.internalImmutableProperty).toBe(undefined);
39+
// });
40+
//
41+
// it("Test Kotlin protected properties should work", function () {
42+
// var kotlinClass = new (com.tns.tests.kotlin.properties.KotlinClassWithProperties.extend({
43+
// getProtectedMutableProperty: function(){
44+
// expect(this.super.protectedMutableProperty).toBe("someProtectedMutableProperty");
45+
// this.super.protectedMutableProperty = "someOtherProtectedMutableProperty";
46+
// expect(this.super.protectedMutableProperty).toBe("someOtherProtectedMutableProperty");
47+
// },
48+
// getProtectedImmutableProperty: function(){
49+
// expect(this.super.protectedImmutableProperty).toBe("someProtectedImmutableProperty");
50+
// try{
51+
// this.super.protectedImmutableProperty = "SHOULD NOT WORK";
52+
// fail();
53+
// } catch {}
54+
// }
55+
// }))();
56+
//
57+
// kotlinClass.getProtectedMutableProperty();
58+
// kotlinClass.getProtectedImmutableProperty();
59+
// });
60+
//
61+
//
62+
// it("Test Kotlin property private should not work", function () {
63+
// var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
64+
// try{
65+
// kotlinClass.privateSetterProperty = "SHOULD NOT WORK";
66+
// fail();
67+
// } catch {}
68+
// });
69+
//
70+
// it("Test Kotlin boolean property should work", function () {
71+
// var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
72+
//
73+
// expect(kotlinClass.isMutableBooleanProperty()).toBe(true);
74+
// kotlinClass.setMutableBooleanProperty(false);
75+
// expect(kotlinClass.isMutableBooleanProperty()).toBe(false);
76+
// });
77+
//
78+
// it("Test Kotlin property with complext type should work", function () {
79+
// var kotlinClass = new com.tns.tests.kotlin.properties.KotlinClassWithProperties();
80+
//
81+
// expect(kotlinClass.mutablePropertyWithComplexType.someString).toBe("test");
82+
//
83+
// var simpleObject = new com.tns.tests.kotlin.SimpleKotlinObject();
84+
// kotlinClass.mutablePropertyWithComplexType = simpleObject;
85+
// expect(kotlinClass.mutablePropertyWithComplexType.equals(simpleObject)).toBe(true);
86+
// });
87+
88+
it("Test Kotlin @get:JvmName properties should work", function () {
89+
for(let i = 0; i< 100; i++) {
90+
var builder = new com.tns.tests.kotlin.properties.KotlinClassWithInternalConstructor.Builder();
91+
builder.scheme('http');
92+
const res = builder.build();
93+
expect(res.scheme()).toBe('http');
94+
expect(res.schemeDifferent()).toBe('http');
95+
}
8696
});
8797
});

‎test-app/app/src/main/assets/app/tests/testPackagePrivate.js

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
describe('Test Package Private', function () {
2+
it('TestPackagePrivateAccessForAppCompiledFiles', function () {
3+
var theFactory = new com.tns.tests.MyFactoryPatternPrivate();
4+
var theProblem = theFactory.getIt();
5+
var didThrow = false;
6+
try {
7+
theProblem.run();
8+
} catch (e) {
9+
// throws if the runtime doesn't have access to instance
10+
didThrow = true;
11+
}
12+
13+
expect(didThrow).toEqual(false);
14+
});
15+
16+
it('TestPackagePrivateAccessForAppCompiledFilesPrivate', function () {
17+
var theFactory = new com.tns.tests.MyFactoryPatternPrivate();
18+
var theProblem = theFactory.getIt();
19+
var didThrow = false;
20+
try {
21+
theProblem.privateThing();
22+
} catch (e) {
23+
// throws if the runtime doesn't have access to instance
24+
didThrow = true;
25+
}
26+
27+
expect(didThrow).toEqual(true);
28+
});
29+
30+
it('TestPackagePrivateAccessForAppCompiledFilesPackagePrivate', function () {
31+
var theFactory = new com.tns.tests.MyFactoryPatternPrivate();
32+
var theProblem = theFactory.getIt();
33+
var didThrow = false;
34+
try {
35+
theProblem.packagePrivateThing();
36+
} catch (e) {
37+
// throws if the runtime doesn't have access to instance
38+
didThrow = true;
39+
}
40+
41+
expect(didThrow).toEqual(false);
42+
});
43+
});

‎test-app/app/src/main/assets/app/tests/testsWithContext.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,20 @@ exports.run = function(cntxt)
126126
til.addView(editText);
127127
}
128128
});
129+
130+
it("TestPackagePrivateAccessForOtherPackages", function () {
131+
132+
var ll = new android.widget.LinearLayout(context);
133+
var didThrow = false;
134+
try{
135+
// https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/widget/LinearLayout.java#685
136+
ll.getVirtualChildCount();
137+
}catch(e){
138+
// will throw since we don't have access to this
139+
didThrow = true;
140+
}
141+
142+
expect(didThrow).toEqual(true);
143+
});
129144
});
130145
};

‎test-app/app/src/main/java/com/tns/tests/MyFactoryPatternPrivate.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.tns.tests;
2+
3+
import android.util.Log;
4+
5+
class PackageProtectedClass implements Runnable {
6+
@Override
7+
public void run() {
8+
Log.d("JS", String.format("Run: I am %s %s", this.getClass(), this));
9+
}
10+
11+
private void privateThing(){}
12+
13+
void packagePrivateThing(){}
14+
}
15+
16+
public class MyFactoryPatternPrivate {
17+
public PackageProtectedClass getIt() {
18+
return new PackageProtectedClass();
19+
}
20+
}

‎test-app/app/src/main/java/com/tns/tests/kotlin/properties/KotlinClassWithInternalConstructor.kt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.tns.tests.kotlin.properties;
2+
3+
class KotlinClassWithInternalConstructor internal constructor(
4+
/** Either "http" or "https". */
5+
@get:JvmName("scheme") val scheme: String,
6+
@get:JvmName("schemeDifferent") val schemeSecond: String
7+
) {
8+
class Builder {
9+
internal var scheme: String? = null
10+
11+
fun scheme(scheme: String) = apply {
12+
when {
13+
scheme.equals("http", ignoreCase = true) -> this.scheme = "http"
14+
scheme.equals("https", ignoreCase = true) -> this.scheme = "https"
15+
else -> throw IllegalArgumentException("unexpected scheme: $scheme")
16+
}
17+
}
18+
19+
fun build(): KotlinClassWithInternalConstructor {
20+
return KotlinClassWithInternalConstructor(
21+
scheme = scheme ?: throw IllegalStateException("scheme == null"),
22+
schemeSecond = scheme ?: throw IllegalStateException("scheme == null"),
23+
)
24+
}
25+
}
26+
}

‎test-app/build-tools/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ mdg-output-dir.txt
1010
mdg-java-dependencies.txt
1111
dts-generator.jar
1212
sbg-input-output-dirs.txt
13+
mdg-java-out.txt

0 commit comments

Comments
 (0)