diff --git a/android/.gitignore b/android/.gitignore
index 56cacb3ced2..2abc0401625 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -2,7 +2,7 @@
.cxx/
.externalNativeBuild/
.gradle/
-.idea/*
+.idea/
!/.idea/codeStyles/
!/.idea/inspectionProfiles/
.project/
diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml
index 8d13c04b12c..36d210ea229 100644
--- a/android/.idea/codeStyles/Project.xml
+++ b/android/.idea/codeStyles/Project.xml
@@ -9,6 +9,9 @@
+
+
+
diff --git a/android/.idea/inspectionProfiles/Project_Default.xml b/android/.idea/inspectionProfiles/Project_Default.xml
index 1eb788b1487..23c812cbcc9 100644
--- a/android/.idea/inspectionProfiles/Project_Default.xml
+++ b/android/.idea/inspectionProfiles/Project_Default.xml
@@ -10,7 +10,11 @@
-
+
+
+
+
+
@@ -155,11 +159,21 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 22de0c84364..d0e214720da 100644
--- a/android/app/build.gradle
+++ b/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
}
diff --git a/android/build.gradle b/android/build.gradle
index 580edafef28..fa34b56b8d3 100644
--- a/android/build.gradle
+++ b/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
}
diff --git a/android/gradle.properties b/android/gradle.properties
index e5e7569a7a5..f2fad85fcc7 100644
--- a/android/gradle.properties
+++ b/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
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index e8be595e3c6..83dc05f6cc4 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/android/kroll-apt/build.gradle b/android/kroll-apt/build.gradle
index 8f5d9d6ddc6..94854133e76 100644
--- a/android/kroll-apt/build.gradle
+++ b/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,7 +49,7 @@ def getChangedFiles() {
}
// Hook into Java compile task.
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
// Check Java code for mistakes before compiling.
dependsOn checkJavaStyle
@@ -55,6 +57,7 @@ tasks.withType(JavaCompile) {
// 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 {
diff --git a/android/kroll-apt/src/main/java/org/appcelerator/kroll/annotations/generator/KrollJSONGenerator.java b/android/kroll-apt/src/main/java/org/appcelerator/kroll/annotations/generator/KrollJSONGenerator.java
index 58a6ad271cc..2d9eca37598 100644
--- a/android/kroll-apt/src/main/java/org/appcelerator/kroll/annotations/generator/KrollJSONGenerator.java
+++ b/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,7 +214,7 @@ 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);
}
}
}
@@ -222,17 +222,18 @@ protected void initialize()
protected void processKrollProxy(final Element element)
{
utils.acceptAnnotations(
- element, new String[] { Kroll_proxy, Kroll_module }, new KrollVisitor() {
- protected Map getProxyProperties(String packageName, String proxyClassName)
+ element, new String[] { Kroll_proxy, Kroll_module }, new KrollVisitor<>()
+ {
+ private Map getProxyProperties(String packageName, String proxyClassName)
{
if (properties == null) {
properties = new HashMap<>();
}
return jsonUtils.getOrCreateMap(jsonUtils.getOrCreateMap(properties, "proxies"),
- packageName + "." + proxyClassName);
+ packageName + "." + proxyClassName);
}
- protected Map getModule(String moduleClassName)
+ private Map getModule(String moduleClassName)
{
if (properties == null) {
properties = new HashMap<>();
@@ -278,7 +279,7 @@ 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);
}
}
@@ -286,7 +287,7 @@ public boolean visit(AnnotationMirror annotation, Object arg)
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 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() {
+ 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 implements KrollVisitor
+ extends SimpleElementVisitor9 implements KrollVisitor
{
@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 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());
}
}
diff --git a/android/modules/locale/src/java/ti/modules/titanium/locale/LocaleModule.java b/android/modules/locale/src/java/ti/modules/titanium/locale/LocaleModule.java
index d76653ce3dc..26e45239744 100644
--- a/android/modules/locale/src/java/ti/modules/titanium/locale/LocaleModule.java
+++ b/android/modules/locale/src/java/ti/modules/titanium/locale/LocaleModule.java
@@ -10,8 +10,10 @@
import java.text.DateFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.Locale;
+import org.appcelerator.kroll.KrollDict;
import org.appcelerator.kroll.KrollModule;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.kroll.common.Log;
@@ -21,8 +23,12 @@
import org.appcelerator.titanium.util.TiPlatformHelper;
import org.appcelerator.titanium.util.TiRHelper;
+import android.os.Build;
import android.telephony.PhoneNumberUtils;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.os.LocaleListCompat;
+
@Kroll.module
public class LocaleModule extends KrollModule
{
@@ -51,6 +57,63 @@ public String getCurrentLocale()
return TiPlatformHelper.getInstance().getLocale();
}
+ @Kroll.setProperty
+ public void setApplicationLocale(String locales)
+ {
+ if (Build.VERSION.SDK_INT >= 33) {
+ LocaleListCompat appLocale = LocaleListCompat.forLanguageTags(locales);
+ AppCompatDelegate.setApplicationLocales(appLocale);
+ } else {
+ Log.w(TAG, "Only available for Android 33 and later");
+ }
+ }
+
+ @Kroll.getProperty
+ public KrollDict[] getApplicationLocales()
+ {
+ if (Build.VERSION.SDK_INT < 33) {
+ Log.w(TAG, "Only available for Android 33 and later");
+ return null;
+ }
+
+ LocaleListCompat localeListCompat = AppCompatDelegate.getApplicationLocales();
+ int size = localeListCompat.size();
+ KrollDict[] locales = new KrollDict[size];
+ for (int i = 0; i < size; i++) {
+ Locale locale = localeListCompat.get(i);
+ if (locale != null) {
+ KrollDict localeObj = new KrollDict();
+ localeObj.put("country", locale.getCountry());
+ localeObj.put("iso3_country", locale.getISO3Country());
+ localeObj.put("display_country", locale.getDisplayCountry());
+ localeObj.put("language", locale.getLanguage());
+ localeObj.put("iso3_language", locale.getISO3Language());
+ localeObj.put("display_language", locale.getDisplayLanguage());
+ localeObj.put("variant", locale.getVariant());
+ localeObj.put("display_variant", locale.getDisplayVariant());
+ localeObj.put("script", locale.getScript());
+ localeObj.put("display_script", locale.getDisplayScript());
+ localeObj.put("display_name", locale.getDisplayName());
+ localeObj.put("language_tag", locale.toLanguageTag());
+ Character[] extensionKeys = new Character[locale.getExtensionKeys().size()];
+ String[] extensions = new String[locale.getExtensionKeys().size()];
+ Iterator extensionKeysSize = locale.getExtensionKeys().iterator();
+ int l = 0;
+ while (extensionKeysSize.hasNext()) {
+ extensionKeys[l] = extensionKeysSize.next();
+ extensions[l] = locale.getExtension(extensionKeys[l]);
+ l++;
+ }
+ localeObj.put("extension_keys", extensionKeys);
+ localeObj.put("extensions", extensions);
+ locales[i] = localeObj;
+ } else {
+ locales[i] = null;
+ }
+ }
+ return locales;
+ }
+
@Kroll.method
public String getCurrencyCode(String localeString)
{
diff --git a/android/settings.gradle b/android/settings.gradle
index 8f0aafe7ada..80822af59ec 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,4 +1,2 @@
rootProject.name = 'TitaniumSDK'
-include ':app'
-include ':kroll-apt'
-include ':titanium'
+include ':app', ':kroll-apt', ':titanium'
diff --git a/android/templates/build/root.build.gradle b/android/templates/build/root.build.gradle
index 8df90e3f35f..350be274dde 100644
--- a/android/templates/build/root.build.gradle
+++ b/android/templates/build/root.build.gradle
@@ -7,8 +7,8 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.0.4'
- classpath 'com.google.gms:google-services:4.3.10'
+ classpath 'com.android.tools.build:gradle:7.4.2'
+ classpath 'com.go4ogle.gms:google-services:4.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
@@ -21,6 +21,6 @@ allprojects {
project.apply from: "${rootDir}/ti.constants.gradle"
}
-task clean(type: Delete) {
- delete rootProject.buildDir
+tasks.register('clean', Delete) {
+ delete rootProject.layout.buildDirectory
}
diff --git a/android/templates/build/ti.constants.gradle b/android/templates/build/ti.constants.gradle
index 503c2f006f1..10cb4bca8c3 100644
--- a/android/templates/build/ti.constants.gradle
+++ b/android/templates/build/ti.constants.gradle
@@ -6,12 +6,13 @@
*/
project.ext {
+ tiNdkVersion = '26.2.11394342'
tiAndroidXAppCompatLibVersion = '1.6.1'
- tiAndroidXCoreLibVersion = '1.9.0'
- tiAndroidXFragmentLibVersion = '1.5.7'
- tiMaterialLibVersion = '1.6.1'
- tiPlayServicesBaseLibVersion = '18.2.0'
+ tiAndroidXCoreLibVersion = '1.12.0'
+ tiAndroidXFragmentLibVersion = '1.6.2'
+ tiMaterialLibVersion = '1.11.0'
+ tiPlayServicesBaseLibVersion = '18.3.0'
tiManifestPlaceholders = [
- tiActivityConfigChanges: 'density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode'
+ tiActivityConfigChanges: 'density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode'
]
}
diff --git a/android/templates/module/generated/build.gradle b/android/templates/module/generated/build.gradle
index f28a5aee09c..ec479bb73ee 100644
--- a/android/templates/module/generated/build.gradle
+++ b/android/templates/module/generated/build.gradle
@@ -12,7 +12,7 @@ repositories {
}
// Path to proxy binding JSON file created by "kroll-apt" annotation processor and used to do C/C++ code generation.
-def tiModuleBindingsJsonPath = "${buildDir}/ti-generated/json/<%- moduleName %>.json".toString()
+def tiModuleBindingsJsonPath = "${project.layout.buildDirectory}/ti-generated/json/<%- moduleName %>.json".toString()
android {
compileSdkVersion <%- compileSdkVersion %>
@@ -47,7 +47,7 @@ android {
// Also have it produce a JSON file of all bindings which is also used to find onAppCreate() method.
arguments = [
'kroll.outputJsonFilePath': tiModuleBindingsJsonPath,
- 'kroll.outputCppDirPath': "${buildDir}/ti-generated/jni".toString(),
+ 'kroll.outputCppDirPath': "${project.layout.buildDirectory}/ti-generated/jni".toString(),
'kroll.jsModuleName': '<%- moduleId %>',
'kroll.tiBindingsJsonFilePath': '<%- tiBindingsJsonPath.replace(/\\/g, '\\\\') %>'
]
@@ -87,13 +87,13 @@ android {
java.srcDirs = [
'src/main/java',
"${projectDir}/../../src",
- "${buildDir}/ti-generated/java"
+ "${project.layout.buildDirectory}/ti-generated/java"
]
// C/C++ source code directories.
jni.srcDirs = [
"${projectDir}/../../jni",
"${projectDir}/src/main/jni",
- "${buildDir}/ti-generated/jni"
+ "${project.layout.buildDirectory}/ti-generated/jni"
]
// C/C++ "*.so" dependency library paths. These libraries will be added to the app.
jniLibs.srcDirs = [
@@ -213,7 +213,7 @@ publishing {
groupId '<%- moduleMavenGroupId %>'
artifactId '<%- moduleMavenArtifactId %>'
version '<%- moduleVersion %>'
- artifact file("${buildDir}/outputs/aar/${project.name}-release.aar")
+ artifact file("${project.layout.buildDirectory}/outputs/aar/${project.name}-release.aar")
// Generates the "*.pom" XML file containing all of Titanium's above dependencies.
pom.withXml {
diff --git a/android/titanium/AndroidManifest.xml b/android/titanium/AndroidManifest.xml
index 300b87bd3b2..98a8989b5f8 100644
--- a/android/titanium/AndroidManifest.xml
+++ b/android/titanium/AndroidManifest.xml
@@ -1,39 +1,40 @@
-
+
+
+ android:configChanges="${tiActivityConfigChanges}"
+ android:exported="false" />
+ android:exported="false"
+ android:theme="@style/Theme.AppDerived.Translucent" />
+ android:exported="false"
+ android:theme="@style/Theme.Titanium.Dark.Fullscreen" />
+ android:exported="false"
+ android:theme="@style/Theme.Titanium.Dark.Fullscreen" />
+ android:exported="false"
+ android:theme="@style/Theme.AppDerived.Fullscreen" />
+ android:exported="false" />
+ android:grantUriPermissions="true" />
diff --git a/android/titanium/build.gradle b/android/titanium/build.gradle
index d92e05cf820..ca140ef61df 100644
--- a/android/titanium/build.gradle
+++ b/android/titanium/build.gradle
@@ -1,4 +1,5 @@
import com.android.build.gradle.tasks.ExternalNativeCleanTask
+import com.android.build.gradle.tasks.ExternalNativeBuildTask
import groovy.json.JsonSlurper
/**
@@ -11,6 +12,7 @@ import groovy.json.JsonSlurper
apply plugin: 'com.android.library'
apply plugin: 'maven-publish'
+
// Fetch Titanium version info to be applied to generated "BuildConfig" Java class and published AAR.
// Prefer environment variables assigned via build/package scripts under "titanium_mobile/build" folder.
def tiBuildVersionString = System.env.TI_SDK_BUILD_VERSION
@@ -41,12 +43,12 @@ for (nextString in tiBuildVersionString.split('\\.')) {
}
android {
- compileSdkVersion 33
+ ndkVersion project.ext.tiNdkVersion
+ namespace 'org.appcelerator.titanium'
defaultConfig {
- minSdkVersion 21
- targetSdkVersion 33
- versionName tiBuildVersionString
- versionCode tiBuildVersionCode
+ compileSdk 34
+ minSdkVersion 26
+ targetSdkVersion 34
buildConfigField('int', 'VERSION_CODE', tiBuildVersionCode.toString())
buildConfigField('String', 'VERSION_NAME', '"' + tiBuildVersionString + '"')
buildConfigField('String', 'TI_BUILD_HASH_STRING', '"' + tiBuildHashString + '"')
@@ -57,9 +59,10 @@ android {
// Set up "kroll-apt" @Kroll annotation processor to generate C/C++ code bindings between V8/Java.
// Also have it produce a JSON file of all bindings to be used by module build system.
arguments = [
- 'kroll.outputJsonFilePath': "${projectDir}/../../dist/android/titanium.bindings.json".toString(),
- 'kroll.outputCppDirPath': "${projectDir}/../runtime/v8/generated".toString(),
- 'kroll.jsModuleName': 'titanium'
+ 'kroll.outputJsonFilePath': "${projectDir}/../../dist/android/titanium.bindings.json".toString(),
+ 'kroll.outputCppDirPath' : "${projectDir}/../runtime/v8/generated".toString(),
+ 'kroll.incremental' : "true",
+ 'kroll.jsModuleName' : 'titanium'
]
}
}
@@ -74,7 +77,7 @@ android {
}
externalNativeBuild {
cmake {
- version '3.10.2'
+ version '3.28.3'
path "${projectDir}/../runtime/v8/src/native/CMakeLists.txt"
}
}
@@ -82,50 +85,45 @@ android {
main {
manifest.srcFile 'AndroidManifest.xml'
assets.srcDirs = [
- 'assets',
- "${projectDir}/../modules/ui/assets"
+ 'assets',
+ "${projectDir}/../modules/ui/assets"
]
java.srcDirs = [
- 'src/java',
- "${projectDir}/../modules/accelerometer/src/java",
- "${projectDir}/../modules/analytics/src/java",
- "${projectDir}/../modules/android/src/java",
- "${projectDir}/../modules/app/src/java",
- "${projectDir}/../modules/calendar/src/java",
- "${projectDir}/../modules/contacts/src/java",
- "${projectDir}/../modules/database/src/java",
- "${projectDir}/../modules/filesystem/src/java",
- "${projectDir}/../modules/geolocation/src/java",
- "${projectDir}/../modules/gesture/src/java",
- "${projectDir}/../modules/locale/src/java",
- "${projectDir}/../modules/media/src/java",
- "${projectDir}/../modules/network/src/java",
- "${projectDir}/../modules/platform/src/java",
- "${projectDir}/../modules/ui/src/java",
- "${projectDir}/../modules/utils/src/java",
- "${projectDir}/../modules/xml/src/java",
- "${projectDir}/../runtime/common/src/java",
- "${projectDir}/../runtime/v8/src/java"
- ]
- jni.srcDirs = [
- "${projectDir}/../runtime/v8/src/native",
- "${projectDir}/../runtime/v8/src/native/modules",
- "${projectDir}/../runtime/v8/generated"
+ 'src/java',
+ "${projectDir}/../modules/accelerometer/src/java",
+ "${projectDir}/../modules/analytics/src/java",
+ "${projectDir}/../modules/android/src/java",
+ "${projectDir}/../modules/app/src/java",
+ "${projectDir}/../modules/calendar/src/java",
+ "${projectDir}/../modules/contacts/src/java",
+ "${projectDir}/../modules/database/src/java",
+ "${projectDir}/../modules/filesystem/src/java",
+ "${projectDir}/../modules/geolocation/src/java",
+ "${projectDir}/../modules/gesture/src/java",
+ "${projectDir}/../modules/locale/src/java",
+ "${projectDir}/../modules/media/src/java",
+ "${projectDir}/../modules/network/src/java",
+ "${projectDir}/../modules/platform/src/java",
+ "${projectDir}/../modules/ui/src/java",
+ "${projectDir}/../modules/utils/src/java",
+ "${projectDir}/../modules/xml/src/java",
+ "${projectDir}/../runtime/common/src/java",
+ "${projectDir}/../runtime/v8/src/java"
]
res.srcDirs = [
- 'res',
- "${projectDir}/../modules/ui/res"
+ 'res',
+ "${projectDir}/../modules/ui/res"
]
}
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_11
- targetCompatibility JavaVersion.VERSION_11
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
}
}
// Downloads/extracts V8 library and creates a cmake file for it. To be executed before C/C++ "build" or "clean".
-task updateV8Library() {
+tasks.register('updateV8Library') {
def packageJson = new JsonSlurper().parse(file("${projectDir}/../package.json"))
def v8MakeFilePath = "${projectDir}/../runtime/v8/src/ndk-modules/libv8/V8Settings.cmake"
inputs.property 'v8.version', packageJson.v8.version
@@ -139,8 +137,8 @@ task updateV8Library() {
def v8MakeFile = file(v8MakeFilePath)
v8MakeFile.getParentFile().mkdirs()
v8MakeFile.text = [
- "set(LIBV8_VERSION \"${packageJson.v8.version}\")",
- "set(LIBV8_MODE \"${packageJson.v8.mode}\")"
+ "set(LIBV8_VERSION \"${packageJson.v8.version}\")",
+ "set(LIBV8_MODE \"${packageJson.v8.mode}\")"
].join('\n') + '\n'
// Download/install the V8 library referenced in our "package.json", if not already done.
@@ -151,57 +149,26 @@ task updateV8Library() {
}
}
}
-preBuild.dependsOn updateV8Library
-tasks.withType(ExternalNativeCleanTask) {
- dependsOn updateV8Library
-}
-// 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) {
- // 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()
}
-// Used to strip the src dir prefixes from the changed java files
-def getChangedFiles() {
- if (!project.hasProperty('changedFiles')) {
- return new ArrayList<>()
- }
- def allFiles = project.changedFiles.split(',')
-
- // Remove the prefix
- List files = new ArrayList<>()
- for (file in allFiles) {
- def index = file.indexOf('src/java/')
- if (index != -1) {
- files.add(file.substring(index + 9))
- }
- }
-
- // Return the list of touched files
- files
-}
-
// Performs a transpile/polyfill/rollup of our "titanium_mobile/common/Resources" directory tree's JS files,
// takes a V8 snapshot of rolled-up files, and then generates a C++ header file of that snapshot to be compiled-in.
// Note: This supports incremental builds. Only executes when JS files change or snapshot output file is missing.
-task snapshotTiCommonFiles() {
+tasks.register('snapshotTiCommonFiles') {
inputs.dir "${projectDir}/../../common/Resources"
inputs.file "${projectDir}/../../build/lib/builder.js"
inputs.file "${projectDir}/../../build/lib/android/index.js"
outputs.file "${projectDir}/../runtime/v8/generated/V8Snapshots.h"
- doLast {
+ doFirst {
exec {
executable = 'node'
workingDir = projectDir
@@ -210,18 +177,9 @@ task snapshotTiCommonFiles() {
}
}
-// Set up project to compile Java side before compiling the C/C++ side.
-// We must do this because our "kroll-apt" Java annotation processor generates C++ source files.
-project.afterEvaluate {
- externalNativeBuildDebug.dependsOn compileDebugJavaWithJavac
- externalNativeBuildRelease.dependsOn compileReleaseJavaWithJavac
- buildCMakeDebug.dependsOn compileDebugJavaWithJavac
- buildCMakeRelWithDebInfo.dependsOn compileReleaseJavaWithJavac
-}
-
// Runs our "prebuild.js" script before the C/C++ compile, but after Java compile. (Mid-build script?)
// Generates C/C++ files providing our Android-only JS files via byte arrays.
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
dependsOn checkJavaStyle
dependsOn snapshotTiCommonFiles
doLast {
@@ -233,6 +191,65 @@ tasks.withType(JavaCompile) {
}
}
+// Set up project to compile Java side before compiling the C/C++ side.
+// We must do this because our "kroll-apt" Java annotation processor generates C++ source files.
+project.afterEvaluate {
+ preBuild.mustRunAfter externalNativeBuildRelease
+ tasks.configureEach {
+ if (it.name == 'compileReleaseJavaWithJavac') {
+ externalNativeBuildRelease.mustRunAfter it
+ } else if (it.name == 'compileDebugJavaWithJavac') {
+ externalNativeBuildDebug.mustRunAfter it
+ } else if (it.name == 'buildCMakeRelWithDebInfo[armeabi-v7a]' || it.name == 'buildCMakeRelWithDebInfo[arm64-v8a]' || it.name == 'buildCMakeRelWithDebInfo[x86]' || it.name == 'buildCMakeRelWithDebInfo[x86_64]') {
+ it.mustRunAfter('compileReleaseJavaWithJavac')
+ } else if (it.name == 'buildCMakeDebug[armeabi-v7a]' || it.name == 'buildCMakeDebug[arm64-v8a]' || it.name == 'buildCMakeDebug[x86]' || it.name == 'buildCMakeDebug[x86_64]') {
+ it.mustRunAfter('compileDebugJavaWithJavac')
+ }
+ }
+ tasks.withType(JavaCompile).configureEach {
+ if (it.name == 'compileReleaseJavaWithJavac' || it.name == 'compileDebugJavaWithJavac') {
+ options.incremental = true // one flag, and things will get MUCH faster
+ }
+ }
+}
+
+tasks.withType(ExternalNativeBuildTask).configureEach {
+ it.mustRunAfter snapshotTiCommonFiles
+}
+
+tasks.withType(ExternalNativeCleanTask).configureEach {
+ dependsOn updateV8Library
+}
+
+// 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).configureEach {
+ // Specify all files that should be checked
+ classpath = files()
+ source android.sourceSets.main.java.srcDirs
+}
+
+// Used to strip the src dir prefixes from the changed java files
+def getChangedFiles() {
+ if (!project.hasProperty('changedFiles')) {
+ return new ArrayList<>()
+ }
+ def allFiles = project.changedFiles.split(',')
+
+ // Remove the prefix
+ List files = new ArrayList<>()
+ for (file in allFiles) {
+ def index = file.indexOf('src/java/')
+ if (index != -1) {
+ files.add(file.substring(index + 9))
+ }
+ }
+
+ // Return the list of touched files
+ files
+}
+
clean.doLast {
// Delete generated C/C++ files.
project.delete file("${projectDir}/../runtime/v8/generated")
@@ -251,17 +268,17 @@ dependencies {
implementation 'androidx.cardview:cardview:1.0.0'
implementation "androidx.core:core:${project.ext.tiAndroidXCoreLibVersion}"
implementation 'androidx.drawerlayout:drawerlayout:1.2.0'
- implementation 'androidx.exifinterface:exifinterface:1.3.6'
+ implementation 'androidx.exifinterface:exifinterface:1.3.7'
implementation "androidx.fragment:fragment:${project.ext.tiAndroidXFragmentLibVersion}"
- implementation 'androidx.media:media:1.6.0'
- implementation 'androidx.recyclerview:recyclerview:1.3.1'
+ implementation 'androidx.media:media:1.7.0'
+ implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.transition:transition:1.4.1'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
implementation 'androidx.viewpager:viewpager:1.0.0'
- implementation 'androidx.annotation:annotation:1.5.0'
+ implementation 'androidx.annotation:annotation:1.7.1'
// Google's "Material Components" themed UI library.
implementation "com.google.android.material:material:${project.ext.tiMaterialLibVersion}"
@@ -269,7 +286,7 @@ dependencies {
// The Google Play Services libraries are only used by Titanium's geolocation feature.
// We link to them dynamically at runtime. So, they can be safely excluded when in the app project.
implementation "com.google.android.gms:play-services-base:${project.ext.tiPlayServicesBaseLibVersion}"
- implementation 'com.google.android.gms:play-services-location:21.0.1'
+ implementation 'com.google.android.gms:play-services-location:21.2.0'
// XML library providing XPath support to our Ti.XML APIs.
implementation 'jaxen:jaxen:1.2.0'
@@ -281,7 +298,7 @@ dependencies {
implementation fileTree(dir: 'lib', include: ['*.jar'])
// CameraX
- def camerax_version = '1.2.3'
+ def camerax_version = '1.3.2'
implementation "androidx.camera:camera-core:$camerax_version"
implementation "androidx.camera:camera-camera2:$camerax_version"
implementation "androidx.camera:camera-video:$camerax_version"
@@ -323,18 +340,20 @@ publishing {
}
}
repositories {
+ google()
maven {
// The maven directory tree produced above will be outputted to the following local directory.
- url "${buildDir}/outputs/m2repository"
+ url "${project.layout.buildDirectory}/outputs/m2repository"
}
}
}
+
publish.doLast {
// After above publishing step, extract C/C++ "*.so" libraries from AAR to "./build/outputs/jniLibs" directory.
- def jniLibsOutputDir = "${buildDir}/outputs/jniLibs"
+ def jniLibsOutputDir = "${project.layout.buildDirectory}/outputs/jniLibs"
project.delete jniLibsOutputDir
copy {
- from zipTree("${buildDir}/outputs/aar/titanium-release.aar")
+ from zipTree("${project.layout.buildDirectory}/outputs/aar/titanium-release.aar")
into jniLibsOutputDir
include 'jni/**/*'
includeEmptyDirs false
diff --git a/android/untar.gradle b/android/untar.gradle
index c8073c36141..20822112eb4 100644
--- a/android/untar.gradle
+++ b/android/untar.gradle
@@ -7,7 +7,7 @@
// Extracts a "*.tar" file using the same parameters as the ant task.
// Used by our prebuild step to extract our "libv8-*.tar.bz2" file.
-task untar() {
+tasks.register('untar') {
// Throw an error if required gradle property has not been set.
if (!project.hasProperty('src')) {
throw new InvalidUserDataException('You must set a "src" property.')
@@ -27,10 +27,10 @@ task untar() {
// Use "ant" to extract the given tarball.
ant.untar(
- compression: project.properties.compression,
- overwrite: project.properties.overwrite,
- src: project.properties.src,
- dest: project.properties.dest)
+ compression: project.properties.compression,
+ overwrite: project.properties.overwrite,
+ src: project.properties.src,
+ dest: project.properties.dest)
}
defaultTasks 'untar'
diff --git a/apidoc/Titanium/Locale/Locale.yml b/apidoc/Titanium/Locale/Locale.yml
index f59a62a8ad2..71188644e7d 100644
--- a/apidoc/Titanium/Locale/Locale.yml
+++ b/apidoc/Titanium/Locale/Locale.yml
@@ -217,7 +217,45 @@ properties:
platforms: [android, iphone, ipad, macos]
type: String
permission: read-only
+
+ - name: applicationLocale
+ summary: Set the UI locale for the app.
+ description: |
+ Set the UI current active locale for the app.
+ When changed, it automatically causes the activity to be restarted.
+ Note: This is only available on Android 33 and up.
+ platforms: [android]
+ since: "12.4.0"
+ type: String
+ examples:
+ - title: Setting the UI locale of the app
+ example: |
+ ``` javascript
+ // This sets the application UI locale.
+ Ti.Locale.applicationLocale = 'en-US';
+ // or
+ Ti.Locale.applicationLocale = 'de';
+ ```
+ - name: applicationLocales
+ permission: read-only
+ summary: Gets the UI locales for the app.
+ description: |
+ Returns an array of objects with the current app UI locales.
+ Note: This is only available on Android 33 and up.
+ platforms: [android]
+ since: "12.4.0"
+ type: Array
+ examples:
+ - title: Getting UI locale(s) of the app
+ example: |
+ ``` javascript
+ // This returns an array of objects for each locale defined for the application's UI.
+ let appLocales = Ti.Locale.applicationLocales;
+ console.log(appLocales[0].language)
+ console.log(appLocales);
+ ```
+
- name: currentLanguage
summary: Language of the current system locale, as an ISO 2-letter code.
description: |
diff --git a/tests/Resources/ti.locale.test.js b/tests/Resources/ti.locale.test.js
index f36f35a2b17..d62d8bc40c2 100644
--- a/tests/Resources/ti.locale.test.js
+++ b/tests/Resources/ti.locale.test.js
@@ -44,6 +44,12 @@ describe('Titanium.Locale', () => {
});
});
+ describe.android('.applicationLocales', () => {
+ it('is a Array', () => {
+ should(Ti.Locale).have.a.property('applicationLocales').which.is.an.Array();
+ });
+ });
+
describe('.currentLanguage', () => {
it('is a String', () => {
should(Ti.Locale).have.a.readOnlyProperty('currentLanguage').which.is.a.String();
@@ -278,6 +284,17 @@ describe('Titanium.Locale', () => {
});
});
+ describe.android('#set applicationLocales(String)', () => {
+ it('has a setter', () => {
+ should(Ti.Locale).have.a.setter('applicationLocales');
+ });
+
+ it('changes .applicationLocales', () => {
+ Ti.Locale.applicationLocales = 'ar';
+ should(Ti.Locale.applicationLocales[0].language).eql('ar');
+ });
+ });
+
describe('#set language(String)', () => {
it('has a setter', () => {
should(Ti.Locale).have.a.setter('language');