Merge pull request #15 from PureSwift/feature/javakit

Add `JavaKit` dependency

Author: colemancda

.gitignore

@@ -38,8 +38,8 @@ playground.xcworkspace
 # Swift Package Manager
 #
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-.swiftpm
-.build
+*.swiftpm
+*.build
 Package.resolved
 
 # CocoaPods
@@ -71,3 +71,6 @@ fastlane/test_output
 
 # Xcode Project
 Android.xcodeproj
+
+# Java
+*.jar

Demo/.gitignore

@@ -0,0 +1,6 @@
+.build
+.swiftpm
+.idea
+.gradle
+*.so
+*.jar

Demo/app/.gitignore

@@ -0,0 +1 @@
+/build

Demo/app/build.gradle.kts

@@ -0,0 +1,86 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
+}
+
+android {
+    namespace = "com.pureswift.swiftandroid"
+    compileSdk = 35
+
+    defaultConfig {
+        applicationId = "com.pureswift.swiftandroid"
+        minSdk = 24
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
+        ndk {
+            //noinspection ChromeOsAbiSupport
+            abiFilters += listOf("arm64-v8a")
+        }
+        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
+    }
+    packaging {
+        resources {
+            excludes += listOf("/META-INF/{AL2.0,LGPL2.1}")
+        }
+        jniLibs {
+            keepDebugSymbols += listOf(
+                "*/arm64-v8a/*.so",
+                "*/armeabi-v7a/*.so",
+                "*/x86_64/*.so"
+            )
+        }
+    }
+/*
+    // Custom Swift build task
+    val buildSwift by tasks.registering(Exec::class) {
+        group = "build"
+        description = "Build Swift sources"
+        workingDir("$projectDir")
+        commandLine("bash", "build-swift.sh")
+    }
+
+    tasks.withType<JavaCompile> {
+        dependsOn(buildSwift)
+    }*/
+}
+
+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)
+}

Demo/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

Demo/app/src/androidTest/java/com/pureswift/swiftandroid/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.pureswift.swiftandroid
+
+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.pureswift.swiftandroid", appContext.packageName)
+    }
+}

Demo/app/src/main/AndroidManifest.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <application
+        android:name=".Application"
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.SwiftAndroid"
+        tools:targetApi="31">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.SwiftAndroid">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

Demo/app/src/main/java/com/example/swift/HelloSubclass.java

@@ -0,0 +1,27 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package com.example.swift;
+
+public class HelloSubclass extends HelloSwift {
+    private String greeting;
+
+    public HelloSubclass(String greeting) {
+        this.greeting = greeting;
+    }
+
+    public void greetMe() {
+        super.greet(greeting);
+    }
+}

Demo/app/src/main/java/com/example/swift/HelloSwift.java

@@ -0,0 +1,64 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package com.example.swift;
+
+import java.util.function.Predicate;
+
+public class HelloSwift {
+    public double value;
+    public static double initialValue = 3.14159;
+    public String name = "Java";
+
+    static {
+        System.loadLibrary("SwiftAndroidApp");
+    }
+
+    public HelloSwift() {
+        this.value = initialValue;
+    }
+
+    public native int sayHello(int x, int y);
+    public native String throwMessageFromSwift(String message) throws Exception;
+
+    // To be called back by the native code
+    public double sayHelloBack(int i) {
+        System.out.println("And hello back from " + name + "! You passed me " + i);
+        return value;
+    }
+
+    public void greet(String name) {
+        System.out.println("Salutations, " + name);
+    }
+
+    public Predicate<Integer> lessThanTen() {
+        Predicate<Integer> predicate = i -> (i < 10);
+        return predicate;
+    }
+
+    public String[] doublesToStrings(double[] doubles) {
+        int size = doubles.length;
+        String[] strings = new String[size];
+
+        for(int i = 0; i < size; i++) {
+            strings[i] = "" + doubles[i];
+        }
+
+        return strings;
+    }
+
+    public void throwMessage(String message) throws Exception {
+        throw new Exception(message);
+    }
+}

Demo/app/src/main/java/com/example/swift/ThreadSafe.java

@@ -0,0 +1,22 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package com.example.swift;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ThreadSafe {
+}