feat(android): getter/setter for applicationLocales in Android 12 and up

android/.gitignore

@@ -2,7 +2,7 @@
 .cxx/
 .externalNativeBuild/
 .gradle/
-.idea/*
+.idea/
 !/.idea/codeStyles/
 !/.idea/inspectionProfiles/
 .project/

android/app/build.gradle

@@ -9,47 +9,49 @@ apply plugin: 'com.android.application'
 
 // Set up Android app project.
 android {
-	compileSdkVersion 33
+	ndkVersion project.ext.tiNdkVersion
 	defaultConfig {
 		applicationId 'com.titanium.test'
-		minSdkVersion 21
-		targetSdkVersion 33
+		compileSdk 34
+		minSdkVersion 26
+		targetSdkVersion 34
 		versionCode 1
 		versionName '1.0'
 		manifestPlaceholders = project.ext.tiManifestPlaceholders
 		manifestPlaceholders.put('localApplicationId', applicationId) // Legacy placeholder old AARs sometimes use.
 	}
-	lintOptions {
-		checkReleaseBuilds false
-	}
 	sourceSets {
 		main {
 			assets.srcDirs = [
-				'src/main/assets',
-				"${projectDir}/../titanium/build/outputs/ti-assets"
+					'src/main/assets',
+					"${projectDir}/../titanium/build/outputs/ti-assets"
 			]
 		}
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_11
-		targetCompatibility JavaVersion.VERSION_11
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
+	}
+	namespace 'com.titanium.test'
+	lint {
+		checkReleaseBuilds false
 	}
 }
 
 // Checks our Java code against our style guidelines and for common coding mistakes using "checkstyle.xml".
 // Will trigger a build failure if any violations have been detected.
 // Customize all the Checkstyle tasks
-tasks.withType(Checkstyle) {
+tasks.withType(Checkstyle).configureEach {
 	// Specify all files that should be checked
 	classpath = files()
 	source android.sourceSets.main.java.srcDirs
 }
 // Execute Checkstyle on all files
-task checkJavaStyle(type: Checkstyle) {
+tasks.register('checkJavaStyle', Checkstyle) {
 	// include '**/*.java'
 }
 // Execute Checkstyle on all modified files
-task checkstyleChanged(type: Checkstyle) {
+tasks.register('checkstyleChanged', Checkstyle) {
 	include getChangedFiles()
 }
 
@@ -73,7 +75,7 @@ def getChangedFiles() {
 	files
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
 	dependsOn checkJavaStyle
 }
 

android/build.gradle

@@ -6,17 +6,17 @@
  */
 
 buildscript {
-	ext.kotlin_version = '1.8.20'
+	ext.kotlin_version = '1.9.23'
 
 	repositories {
 		google()
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.0.4'
-		classpath 'com.google.gms:google-services:4.3.15'
+		classpath 'com.android.tools.build:gradle:8.3.1'
+		classpath 'com.google.gms:google-services:4.4.1'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-		classpath 'org.codehaus.groovy:groovy-json:3.0.11'
+		classpath 'org.codehaus.groovy:groovy-json:3.0.17'
 	}
 }
 
@@ -30,7 +30,7 @@ allprojects {
 	project.apply plugin: 'checkstyle'
 	checkstyle {
 		toolVersion = '8.38'
-		configFile file("${rootDir}/checkstyle.xml");
+		configFile file("${rootDir}/checkstyle.xml")
 		ignoreFailures false
 		showViolations true
 	}
@@ -39,6 +39,6 @@ allprojects {
 	project.apply from: "${rootDir}/templates/build/ti.constants.gradle"
 }
 
-task clean(type: Delete) {
-	delete rootProject.buildDir
+tasks.register('clean', Delete) {
+	delete project.layout.buildDirectory
 }

android/gradle.properties

@@ -15,3 +15,6 @@ android.enableJetifier=false
 
 # remove if com.android.tools.build:gradle can be raised in /android/build.gradle
 android.suppressUnsupportedCompileSdk=33
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
+#Tue Mar 19 21:28:34 EET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/kroll-apt/build.gradle

@@ -7,22 +7,24 @@
 
 apply plugin: 'java'
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
+java {
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
+}
 
 // Checks our Java code against our style guidelines and for common coding mistakes using "checkstyle.xml".
 // Will trigger a build failure if any violations have been detected.
 // Customize all the Checkstyle tasks
-tasks.withType(Checkstyle) {
+tasks.withType(Checkstyle).configureEach {
 	// Specify all files that should be checked
 	classpath = files()
 	source 'src/main/java'
 }
 // Execute Checkstyle on all files
-task checkJavaStyle(type: Checkstyle) {
+tasks.register('checkJavaStyle', Checkstyle) {
 	// include '**/*.java'
 }
-task checkstyleChanged(type: Checkstyle) {
+tasks.register('checkstyleChanged', Checkstyle) {
 	include getChangedFiles()
 }
 
@@ -47,14 +49,15 @@ def getChangedFiles() {
 }
 
 // Hook into Java compile task.
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
 	// Check Java code for mistakes before compiling.
 	dependsOn checkJavaStyle
 
 	// Suppress compiler warning "bootstrap class path not set in conjunction with source" which happens when
 	// building with JDK newer than the Java version we're targeting. (Ex: Build with JDK 8, but target Java 7.)
 	// Note: Build tool wants a reference to runtime JAR of the same version we're targeting. Not going to happen.
 	options.compilerArgs << '-Xlint:-options'
+	options.incremental = true
 }
 
 // Bundle the below library dependencies within this project's built JAR.
@@ -69,6 +72,7 @@ jar {
 		}
 	}
 	duplicatesStrategy = DuplicatesStrategy.INCLUDE
+	version '1.0.0'
 }
 
 dependencies {

android/kroll-apt/src/main/java/org/appcelerator/kroll/annotations/generator/KrollJSONGenerator.java

@@ -30,14 +30,14 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
-import javax.lang.model.util.SimpleElementVisitor6;
+import javax.lang.model.util.SimpleElementVisitor9;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 
 import org.json.simple.JSONValue;
 
-@SupportedSourceVersion(SourceVersion.RELEASE_11)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 @SuppressWarnings("unchecked")
 @SupportedAnnotationTypes({
 	KrollJSONGenerator.Kroll_argument,
@@ -214,25 +214,26 @@ protected void initialize()
 			} catch (Exception e) {
 				// file doesn't exist, we'll just create it later
 				debug("No binding data found, creating new data file: %s/%s", this.jarJsonPackageName,
-					  this.jarJsonFileName);
+					this.jarJsonFileName);
 			}
 		}
 	}
 
 	protected void processKrollProxy(final Element element)
 	{
 		utils.acceptAnnotations(
-			element, new String[] { Kroll_proxy, Kroll_module }, new KrollVisitor<AnnotationMirror>() {
-				protected Map<Object, Object> getProxyProperties(String packageName, String proxyClassName)
+			element, new String[] { Kroll_proxy, Kroll_module }, new KrollVisitor<>()
+			{
+				private Map<Object, Object> getProxyProperties(String packageName, String proxyClassName)
 				{
 					if (properties == null) {
 						properties = new HashMap<>();
 					}
 					return jsonUtils.getOrCreateMap(jsonUtils.getOrCreateMap(properties, "proxies"),
-													packageName + "." + proxyClassName);
+						packageName + "." + proxyClassName);
 				}
 
-				protected Map<Object, Object> getModule(String moduleClassName)
+				private Map<Object, Object> getModule(String moduleClassName)
 				{
 					if (properties == null) {
 						properties = new HashMap<>();
@@ -278,15 +279,15 @@ public boolean visit(AnnotationMirror annotation, Object arg)
 						String createInModuleClass = (String) proxyAttrs.get("creatableInModule");
 						if (!createInModuleClass.equals(Kroll_DEFAULT)) {
 							jsonUtils.appendUniqueObject(getModule(createInModuleClass), "createProxies",
-														 "proxyClassName", proxyAttrs);
+								"proxyClassName", proxyAttrs);
 						}
 					}
 
 					if (isModule && proxyAttrs.containsKey("parentModule")) {
 						String parentModuleClass = (String) proxyAttrs.get("parentModule");
 						if (!parentModuleClass.equals(Kroll_DEFAULT)) {
 							jsonUtils.appendUniqueObject(getModule(parentModuleClass), "childModules", "proxyClassName",
-														 proxyAttrs);
+								proxyAttrs);
 						} else {
 							proxyAttrs.remove("parentModule");
 						}
@@ -298,7 +299,7 @@ public boolean visit(AnnotationMirror annotation, Object arg)
 						HashMap<String, Object> topLevelParams = utils.getAnnotationParams(element, Kroll_topLevel);
 						List<?> topLevelNames = (List<?>) topLevelParams.get("value");
 						if (topLevelNames.size() == 1 && topLevelNames.get(0).equals(DEFAULT_NAME)) {
-							topLevelNames = Arrays.asList(apiName);
+							topLevelNames = Collections.singletonList(apiName);
 						}
 
 						proxyAttrs.put("topLevelNames", topLevelNames);
@@ -307,7 +308,8 @@ public boolean visit(AnnotationMirror annotation, Object arg)
 					BindingVisitor visitor = new BindingVisitor();
 					final BindingVisitor fVisitor = visitor;
 					if (utils.hasAnnotation(element, Kroll_dynamicApis)) {
-						utils.acceptAnnotations(element, Kroll_dynamicApis, new KrollVisitor<AnnotationMirror>() {
+						utils.acceptAnnotations(element, Kroll_dynamicApis, new KrollVisitor<>()
+						{
 							@Override
 							public boolean visit(AnnotationMirror annotation, Object arg)
 							{
@@ -352,7 +354,7 @@ public boolean visit(AnnotationMirror annotation, Object arg)
 	}
 
 	protected class BindingVisitor
-		extends SimpleElementVisitor6<Object, Object> implements KrollVisitor<AnnotationMirror>
+		extends SimpleElementVisitor9<Object, Object> implements KrollVisitor<AnnotationMirror>
 	{
 		@Override
 		public String visitExecutable(ExecutableElement e, Object p)
@@ -608,12 +610,12 @@ protected void visitInject(AnnotationMirror annotation, Element element, boolean
 			String defaultType = null;
 			if (isMethod) {
 				List<? extends VariableElement> params = ((ExecutableElement) element).getParameters();
-				if (params.size() > 0) {
+				if (!params.isEmpty()) {
 					VariableElement firstParam = params.get(0);
 					defaultType = utils.getType(firstParam);
 				} else {
 					warn("Skipping injection into method %s, at least one argument is required in a setter",
-						 utils.getName(element));
+						utils.getName(element));
 					return;
 				}
 			} else {
@@ -779,7 +781,7 @@ protected void generateJSON()
 				writer.close();
 			} catch (Exception e) {
 				debug("Exception trying to generate JSON: %s/%s, %s", this.jarJsonPackageName, this.jarJsonFileName,
-					  e.getMessage());
+					e.getMessage());
 			}
 		}