diff --git a/Package.swift b/Package.swift
index 58ee1840..ff8ee010 100644
--- a/Package.swift
+++ b/Package.swift
@@ -244,8 +244,10 @@ let package = Package(
.when(platforms: [.windows])),
.linkedLibrary(
"jvm",
- .when(platforms: [.linux, .macOS, .windows])
- ),
+ .when(platforms: [.iOS, .macOS, .tvOS, .watchOS, .macCatalyst, .linux, .openbsd, .wasi, .windows])),
+ .linkedLibrary(
+ "nativehelper",
+ .when(platforms: [.android])),
]
),
.target(
diff --git a/Samples/JavaKitSampleApp/Package.swift b/Samples/JavaKitSampleApp/Package.swift
index 0956290c..1d95fb45 100644
--- a/Samples/JavaKitSampleApp/Package.swift
+++ b/Samples/JavaKitSampleApp/Package.swift
@@ -30,7 +30,7 @@ func findJavaHome() -> String {
}
let javaHome = findJavaHome()
-let javaIncludePath = "\(javaHome)/include"
+let javaIncludePath = ProcessInfo.processInfo.environment["JAVA_INCLUDE_PATH"] ?? "\(javaHome)/include"
#if os(Linux)
let javaPlatformIncludePath = "\(javaIncludePath)/linux"
#elseif os(macOS)
@@ -43,7 +43,7 @@ let javaIncludePath = "\(javaHome)/include"
let package = Package(
name: "JavaKitSampleApp",
platforms: [
- .macOS(.v13),
+ .macOS(.v15),
.iOS(.v13),
.tvOS(.v13),
.watchOS(.v6),
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.gitignore b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.gitignore
new file mode 100644
index 00000000..aa724b77
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.gitignore
@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/.gitignore b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/.gitignore
new file mode 100644
index 00000000..26d33521
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/.name b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/.name
new file mode 100644
index 00000000..bd0ae1b3
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/.name
@@ -0,0 +1 @@
+JavaKitSampleApp
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/codeStyles/Project.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000..7643783a
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/codeStyles/Project.xml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/codeStyles/codeStyleConfig.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 00000000..79ee123c
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/compiler.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/compiler.xml
new file mode 100644
index 00000000..b86273d9
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/deploymentTargetSelector.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/deploymentTargetSelector.xml
new file mode 100644
index 00000000..b268ef36
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/gradle.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/gradle.xml
new file mode 100644
index 00000000..7b3006b6
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/gradle.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/kotlinc.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/kotlinc.xml
new file mode 100644
index 00000000..6d0ee1c2
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/migrations.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/migrations.xml
new file mode 100644
index 00000000..f8051a6f
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/migrations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/misc.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/misc.xml
new file mode 100644
index 00000000..b2c751a3
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/misc.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/runConfigurations.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/runConfigurations.xml
new file mode 100644
index 00000000..16660f1d
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/vcs.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/vcs.xml
new file mode 100644
index 00000000..4fce1d86
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/.gitignore b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/.gitignore
new file mode 100644
index 00000000..97873191
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/.gitignore
@@ -0,0 +1,2 @@
+/build
+/libs
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/build.gradle.kts b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/build.gradle.kts
new file mode 100644
index 00000000..01078295
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/build.gradle.kts
@@ -0,0 +1,66 @@
+plugins {
+ alias(libs.plugins.android.application)
+ alias(libs.plugins.kotlin.android)
+ alias(libs.plugins.kotlin.compose)
+}
+
+android {
+ namespace = "com.example.swift"
+ compileSdk = 34
+
+ defaultConfig {
+ applicationId = "com.example.swift"
+ minSdk = 24
+ targetSdk = 34
+ versionCode = 1
+ versionName = "1.0"
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ }
+
+ buildTypes {
+ release {
+ isMinifyEnabled = false
+ proguardFiles(
+ getDefaultProguardFile("proguard-android-optimize.txt"),
+ "proguard-rules.pro"
+ )
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+ kotlinOptions {
+ jvmTarget = "11"
+ }
+ buildFeatures {
+ compose = true
+ }
+
+ sourceSets {
+ getByName("main") {
+ jniLibs.srcDir("libs")
+ jni.srcDirs(emptyArray())
+ }
+ }
+}
+
+dependencies {
+
+ implementation(libs.androidx.core.ktx)
+ implementation(libs.androidx.lifecycle.runtime.ktx)
+ implementation(libs.androidx.activity.compose)
+ implementation(platform(libs.androidx.compose.bom))
+ implementation(libs.androidx.ui)
+ implementation(libs.androidx.ui.graphics)
+ implementation(libs.androidx.ui.tooling.preview)
+ implementation(libs.androidx.material3)
+ testImplementation(libs.junit)
+ androidTestImplementation(libs.androidx.junit)
+ androidTestImplementation(libs.androidx.espresso.core)
+ androidTestImplementation(platform(libs.androidx.compose.bom))
+ androidTestImplementation(libs.androidx.ui.test.junit4)
+ debugImplementation(libs.androidx.ui.tooling)
+ debugImplementation(libs.androidx.ui.test.manifest)
+}
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/proguard-rules.pro b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/androidTest/java/com/example/swift/ExampleInstrumentedTest.kt b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/androidTest/java/com/example/swift/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..a1c3c781
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/androidTest/java/com/example/swift/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.example.swift
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("com.example.swift", appContext.packageName)
+ }
+}
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/AndroidManifest.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..3f253fc9
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/AndroidManifest.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/HelloSwift.kt b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/HelloSwift.kt
new file mode 100644
index 00000000..e7e447cd
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/HelloSwift.kt
@@ -0,0 +1,97 @@
+package com.example.swift
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.example.swift.ui.theme.JavaKitSampleAppTheme
+import java.util.function.Predicate
+
+open class HelloSwift : ComponentActivity() {
+ init {
+ System.loadLibrary("JavaKitExample")
+ }
+
+ external fun sayHello(x: Int, y: Int): Int
+ external fun throwMessageFromSwift(message: String)
+
+ private fun getGreeting(): String {
+ val result = sayHello(17, 25)
+ return "$result"
+ }
+
+ var value: Double = 0.0
+ var name: String = "Java"
+
+ fun sayHelloBack(i: Int): Double {
+ return value
+ }
+
+ fun greet(name: String) {
+ println("Salutations, $name")
+ }
+
+ fun lessThanTen(): Predicate {
+ val predicate = Predicate { it < 10 }
+ return predicate
+ }
+
+ fun doublesToStrings(doubles: DoubleArray): Array {
+ val size = doubles.count()
+ var strings: Array = arrayOfNulls(doubles.count())
+
+ doubles.forEachIndexed { index, element ->
+ strings[index] = "$element"
+ }
+
+ return strings
+ }
+
+ fun throwMessage(message: String) {
+ throw Exception(message)
+ }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ enableEdgeToEdge()
+ setContent {
+ JavaKitSampleAppTheme {
+ Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+ Greeting(
+ name = getGreeting(),
+ modifier = Modifier.padding(innerPadding)
+ )
+ }
+ }
+ }
+ }
+}
+
+@Composable
+fun Greeting(name: String, modifier: Modifier = Modifier) {
+ Text(
+ text = "sayHello(17, 25) = $name",
+ modifier = modifier
+ )
+}
+
+@Preview(showBackground = true)
+@Composable
+fun GreetingPreview() {
+ JavaKitSampleAppTheme {
+ Greeting("Android")
+ }
+}
+
+class HelloSubclass(private val greeting: String = "Swift"): HelloSwift() {
+ fun greetMe() {
+ super.greet(greeting)
+ }
+}
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ThreadSafe.kt b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ThreadSafe.kt
new file mode 100644
index 00000000..c025e1ca
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ThreadSafe.kt
@@ -0,0 +1,8 @@
+package com.example.swift
+
+import kotlin.annotation.AnnotationRetention
+import kotlin.annotation.AnnotationTarget
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY)
+annotation class ThreadSafe
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ThreadSafeHelperClass.kt b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ThreadSafeHelperClass.kt
new file mode 100644
index 00000000..455586a1
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ThreadSafeHelperClass.kt
@@ -0,0 +1,21 @@
+package com.example.swift
+
+import java.util.Optional
+import java.util.OptionalDouble
+import java.util.OptionalInt
+import java.util.OptionalLong
+
+@ThreadSafe
+class ThreadSafeHelperClass {
+ var text: Optional = Optional.of("")
+
+ val `val`: OptionalDouble = OptionalDouble.of(2.0)
+
+ fun getValue(name: Optional): String {
+ return name.orElse("")
+ }
+
+ fun from(value: OptionalInt): OptionalLong {
+ return OptionalLong.of(value.asInt.toLong())
+ }
+}
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ui/theme/Color.kt b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ui/theme/Color.kt
new file mode 100644
index 00000000..856c3555
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ui/theme/Color.kt
@@ -0,0 +1,11 @@
+package com.example.swift.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ui/theme/Theme.kt b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ui/theme/Theme.kt
new file mode 100644
index 00000000..e2e5be2e
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ui/theme/Theme.kt
@@ -0,0 +1,58 @@
+package com.example.swift.ui.theme
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+
+private val DarkColorScheme = darkColorScheme(
+ primary = Purple80,
+ secondary = PurpleGrey80,
+ tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+ primary = Purple40,
+ secondary = PurpleGrey40,
+ tertiary = Pink40
+
+ /* Other default colors to override
+ background = Color(0xFFFFFBFE),
+ surface = Color(0xFFFFFBFE),
+ onPrimary = Color.White,
+ onSecondary = Color.White,
+ onTertiary = Color.White,
+ onBackground = Color(0xFF1C1B1F),
+ onSurface = Color(0xFF1C1B1F),
+ */
+)
+
+@Composable
+fun JavaKitSampleAppTheme(
+ darkTheme: Boolean = isSystemInDarkTheme(),
+ // Dynamic color is available on Android 12+
+ dynamicColor: Boolean = true,
+ content: @Composable () -> Unit
+) {
+ val colorScheme = when {
+ dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+ val context = LocalContext.current
+ if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+ }
+
+ darkTheme -> DarkColorScheme
+ else -> LightColorScheme
+ }
+
+ MaterialTheme(
+ colorScheme = colorScheme,
+ typography = Typography,
+ content = content
+ )
+}
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ui/theme/Type.kt b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ui/theme/Type.kt
new file mode 100644
index 00000000..37169b2f
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/java/com/example/swift/ui/theme/Type.kt
@@ -0,0 +1,34 @@
+package com.example.swift.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+ bodyLarge = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Normal,
+ fontSize = 16.sp,
+ lineHeight = 24.sp,
+ letterSpacing = 0.5.sp
+ )
+ /* Other default text styles to override
+ titleLarge = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Normal,
+ fontSize = 22.sp,
+ lineHeight = 28.sp,
+ letterSpacing = 0.sp
+ ),
+ labelSmall = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Medium,
+ fontSize = 11.sp,
+ lineHeight = 16.sp,
+ letterSpacing = 0.5.sp
+ )
+ */
+)
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/drawable/ic_launcher_background.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000..07d5da9c
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/drawable/ic_launcher_foreground.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..2b068d11
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..6f3b755b
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..6f3b755b
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 00000000..c209e78e
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..b2dfe3d1
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 00000000..4f0f1d64
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..62b611da
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 00000000..948a3070
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..1b9a6956
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..28d4b77f
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..9287f508
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..aa7d6427
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..9126ae37
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/values/colors.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/values/colors.xml
new file mode 100644
index 00000000..f8c6127d
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+
+
+ #FFBB86FC
+ #FF6200EE
+ #FF3700B3
+ #FF03DAC5
+ #FF018786
+ #FF000000
+ #FFFFFFFF
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/values/strings.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000..d787151f
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ JavaKitSampleApp
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/values/themes.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/values/themes.xml
new file mode 100644
index 00000000..97aad83e
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/values/themes.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/xml/backup_rules.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 00000000..fa0f996d
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/xml/data_extraction_rules.xml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 00000000..9ee9997b
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/test/java/com/example/swift/ExampleUnitTest.kt b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/test/java/com/example/swift/ExampleUnitTest.kt
new file mode 100644
index 00000000..228792d2
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/app/src/test/java/com/example/swift/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.example.swift
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+ @Test
+ fun addition_isCorrect() {
+ assertEquals(4, 2 + 2)
+ }
+}
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/build.gradle.kts b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/build.gradle.kts
new file mode 100644
index 00000000..952b9306
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/build.gradle.kts
@@ -0,0 +1,6 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+ alias(libs.plugins.android.application) apply false
+ alias(libs.plugins.kotlin.android) apply false
+ alias(libs.plugins.kotlin.compose) apply false
+}
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle.properties b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle.properties
new file mode 100644
index 00000000..20e2a015
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle.properties
@@ -0,0 +1,23 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle/libs.versions.toml b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle/libs.versions.toml
new file mode 100644
index 00000000..a1a05919
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle/libs.versions.toml
@@ -0,0 +1,32 @@
+[versions]
+agp = "8.7.1"
+kotlin = "2.0.0"
+coreKtx = "1.10.1"
+junit = "4.13.2"
+junitVersion = "1.1.5"
+espressoCore = "3.5.1"
+lifecycleRuntimeKtx = "2.6.1"
+activityCompose = "1.8.0"
+composeBom = "2024.04.01"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle/wrapper/gradle-wrapper.jar b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..e708b1c0
Binary files /dev/null and b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle/wrapper/gradle-wrapper.properties b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..2df92467
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Thu Oct 31 16:27:31 AEDT 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradlew b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradlew
new file mode 100755
index 00000000..4f906e0c
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=`expr $i + 1`
+ done
+ case $i in
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradlew.bat b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradlew.bat
new file mode 100644
index 00000000..ac1b06f9
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/settings.gradle.kts b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/settings.gradle.kts
new file mode 100644
index 00000000..13110388
--- /dev/null
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitAndroidExample/settings.gradle.kts
@@ -0,0 +1,23 @@
+pluginManagement {
+ repositories {
+ google {
+ content {
+ includeGroupByRegex("com\\.android.*")
+ includeGroupByRegex("com\\.google.*")
+ includeGroupByRegex("androidx.*")
+ }
+ }
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
+dependencyResolutionManagement {
+ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+ repositories {
+ google()
+ mavenCentral()
+ }
+}
+
+rootProject.name = "JavaKitSampleApp"
+include(":app")
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift b/Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift
index f074fee6..a7d13493 100644
--- a/Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift
+++ b/Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift
@@ -27,7 +27,10 @@ extension HelloSwift: HelloSwiftNativeMethods {
let answer = self.sayHelloBack(i + j)
print("Swift got back \(answer) from Java")
+#if !canImport(Android)
+ // no class variables in Kotlin
print("We expect the above value to be the initial value, \(self.javaClass.initialValue)")
+#endif
print("Updating Java field value to something different")
self.value = 2.71828
diff --git a/Samples/JavaKitSampleApp/swift-build-android.sh b/Samples/JavaKitSampleApp/swift-build-android.sh
new file mode 100755
index 00000000..0b49872f
--- /dev/null
+++ b/Samples/JavaKitSampleApp/swift-build-android.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+set -Eeu
+
+unset JAVA_HOME
+unset JAVA_INCLUDE_PATH
+
+NDK_VERS=31
+
+SWIFT_VERS=6.1.2
+SWIFT_SDK="$(swift sdk list|grep android|tail -1)"
+SWIFT_SDK_SYSROOT="${HOME}/.swiftpm/swift-sdks/${SWIFT_SDK}.artifactbundle/swift-${SWIFT_VERS}-release-android-24-sdk/android-27c-sysroot"
+
+HOST_JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home"
+TARGET_JAVA_HOME="/Applications/Android Studio.app/Contents/jbr/Contents/Home"
+
+TOOLCHAINS="/Library/Developer/Toolchains/swift-${SWIFT_VERS}-RELEASE.xctoolchain"
+export TOOLCHAINS
+
+BUILD_CONFIG=debug
+export BUILD_CONFIG
+
+TRIPLE="aarch64-unknown-linux-android${NDK_VERS}"
+export TRIPLE
+
+export JAVA_HOME=${HOST_JAVA_HOME}
+export JAVA_INCLUDE_PATH=${HOST_JAVA_HOME}/include
+
+swift build --configuration ${BUILD_CONFIG} -Xswiftc -Xfrontend -Xswiftc -disable-round-trip-debug-types --toolchain ${TOOLCHAINS} --product SwiftJavaTool
+swift build --configuration ${BUILD_CONFIG} -Xswiftc -Xfrontend -Xswiftc -disable-round-trip-debug-types --toolchain ${TOOLCHAINS} --product JavaCompilerPlugin
+
+export JAVA_HOME=${TARGET_JAVA_HOME}
+export JAVA_INCLUDE_PATH="${SWIFT_SDK_SYSROOT}/usr/include"
+swift build --configuration ${BUILD_CONFIG} -Xswiftc -Xfrontend -Xswiftc -disable-round-trip-debug-types --toolchain ${TOOLCHAINS} --swift-sdk ${TRIPLE} --product JavaKitExample
+
+cd Sources/JavaKitAndroidExample
+
+APP_LIBS=app/libs/arm64-v8a
+
+mkdir -p ${APP_LIBS}
+cp ../../.build/${TRIPLE}/${BUILD_CONFIG}/libJavaKitExample.so ${APP_LIBS}
+cp ${SWIFT_SDK_SYSROOT}/usr/lib/aarch64-linux-android/${NDK_VERS}/lib*.so ${APP_LIBS}
+rm -f ${APP_LIBS}/lib{c,dl,log,m,z}.so
+
+if [ "X${BUILD_CONFIG}" == "Xdebug" ]; then
+ ./gradlew assembleDebug
+ ./gradlew installDebug
+else
+ ./gradlew assembleRelease
+ ./gradlew installRelease
+fi
diff --git a/Sources/ExampleSwiftLibrary/MySwiftLibrary.swift b/Sources/ExampleSwiftLibrary/MySwiftLibrary.swift
index 1c9477f1..9ccbc164 100644
--- a/Sources/ExampleSwiftLibrary/MySwiftLibrary.swift
+++ b/Sources/ExampleSwiftLibrary/MySwiftLibrary.swift
@@ -23,6 +23,8 @@ import Glibc
import CRT
#elseif canImport(Darwin)
import Darwin.C
+#elseif canImport(Android)
+import Android
#endif
public func helloWorld() {
diff --git a/Sources/JavaKit/JavaEnvironment.swift b/Sources/JavaKit/JavaEnvironment.swift
index d74146ab..7dcc242f 100644
--- a/Sources/JavaKit/JavaEnvironment.swift
+++ b/Sources/JavaKit/JavaEnvironment.swift
@@ -14,6 +14,10 @@
import JavaRuntime
+#if canImport(Android)
+typealias JNINativeInterface_ = JNINativeInterface
+#endif
+
extension UnsafeMutablePointer {
var interface: JNINativeInterface_ { self.pointee!.pointee }
}
diff --git a/Sources/JavaKit/JavaKitVM/JavaVirtualMachine.swift b/Sources/JavaKit/JavaKitVM/JavaVirtualMachine.swift
index 0800a89e..edbddbb7 100644
--- a/Sources/JavaKit/JavaKitVM/JavaVirtualMachine.swift
+++ b/Sources/JavaKit/JavaKitVM/JavaVirtualMachine.swift
@@ -19,6 +19,11 @@ import Foundation
#endif
public typealias JavaVMPointer = UnsafeMutablePointer
+#if canImport(Android)
+typealias JNIEnvPointer = UnsafeMutablePointer
+#else
+typealias JNIEnvPointer = UnsafeMutableRawPointer
+#endif
public final class JavaVirtualMachine: @unchecked Sendable {
/// The JNI version that we depend on.
@@ -61,7 +66,7 @@ public final class JavaVirtualMachine: @unchecked Sendable {
) throws {
self.classpath = classpath
var jvm: JavaVMPointer? = nil
- var environment: UnsafeMutableRawPointer? = nil
+ var environment: JNIEnvPointer? = nil
var vmArgs = JavaVMInitArgs()
vmArgs.version = JavaVirtualMachine.jniVersion
vmArgs.ignoreUnrecognized = jboolean(ignoreUnrecognized ? JNI_TRUE : JNI_FALSE)
@@ -161,12 +166,18 @@ extension JavaVirtualMachine {
return environment.assumingMemoryBound(to: JNIEnv?.self)
}
+#if canImport(Android)
+ var jniEnv = environment?.assumingMemoryBound(to: JNIEnv?.self)
+#else
+ var jniEnv = environment
+#endif
+
// Attach the current thread to the JVM.
let attachResult: jint
if asDaemon {
- attachResult = jvm.pointee!.pointee.AttachCurrentThreadAsDaemon(jvm, &environment, nil)
+ attachResult = jvm.pointee!.pointee.AttachCurrentThreadAsDaemon(jvm, &jniEnv, nil)
} else {
- attachResult = jvm.pointee!.pointee.AttachCurrentThread(jvm, &environment, nil)
+ attachResult = jvm.pointee!.pointee.AttachCurrentThread(jvm, &jniEnv, nil)
}
// If we failed to attach, report that.
@@ -175,9 +186,13 @@ extension JavaVirtualMachine {
throw attachError
}
- JavaVirtualMachine.destroyTLS.set(environment!)
+ JavaVirtualMachine.destroyTLS.set(jniEnv!)
- return environment!.assumingMemoryBound(to: JNIEnv?.self)
+#if canImport(Android)
+ return jniEnv!
+#else
+ return jniEnv!.assumingMemoryBound(to: JNIEnv?.self)
+#endif
}
/// Detach the current thread from the Java Virtual Machine. All Java
diff --git a/Sources/JavaKit/JavaObjectHolder.swift b/Sources/JavaKit/JavaObjectHolder.swift
index 173991c9..75adbfed 100644
--- a/Sources/JavaKit/JavaObjectHolder.swift
+++ b/Sources/JavaKit/JavaObjectHolder.swift
@@ -19,13 +19,21 @@ import JavaRuntime
/// while this instance is live.
public class JavaObjectHolder {
public private(set) var object: jobject?
+#if canImport(Android)
+ public var environment: JNIEnvironment {
+ try! JavaVirtualMachine.shared().environment()
+ }
+#else
public let environment: JNIEnvironment
+#endif
/// Take a reference to a Java object and promote it to a global reference
/// so that the Java virtual machine will not garbage-collect it.
public init(object: jobject, environment: JNIEnvironment) {
self.object = environment.interface.NewGlobalRef(environment, object)
+#if !canImport(Android)
self.environment = environment
+#endif
}
/// Forget this Java object, meaning that it is no longer used from anywhere