Restructure everything, native is now top level and app is written in…

… kotlin with new Jetpack Compose ui

.github/workflows/build.yml

@@ -44,8 +44,7 @@ jobs:
       - name: Build native libs
         run: |
           unset ANDROID_SDK_ROOT # Deprecated, will cause an error if left set.
-          cd native
-          cargo ndk --target ${{ matrix.android-abi }} --platform 26 -o ../jniLibs build --release
+          cargo ndk --target ${{ matrix.android-abi }} --platform 26 -o jniLibs build --release
 
       - uses: actions/upload-artifact@v4
         with:
@@ -65,8 +64,8 @@ jobs:
 
       - name: Copy native libs
         run: |
-          mkdir app/ruffle/src/main/jniLibs
-          cp -r native-libs/*/* app/ruffle/src/main/jniLibs/
+          mkdir app/src/main/jniLibs
+          cp -r native-libs/*/* app/src/main/jniLibs/
 
       - name: Set up Java 17
         uses: actions/setup-java@v4
@@ -77,21 +76,19 @@ jobs:
       - name: Build debug APK
         # The native libs are always built in release mode, this is left in here just so if
         # something with the signing procedure below goes haywire, we still have something.
-        run: |
-          cd app
-          ./gradlew assembleDebug # The release version doesn't work without signing
+        run: ./gradlew assembleDebug # The release version doesn't work without signing
 
       - uses: actions/upload-artifact@v4
         with:
           name: ruffle-debug-apks
-          path: app/ruffle/build/outputs/apk/debug/*.apk
+          path: app/build/outputs/apk/debug/*.apk
 
       - name: Decode keystore
         if: ${{ !github.event.pull_request.head.repo.fork }}
         env:
             ENCODED_STRING: ${{ secrets.KEYSTORE }}
         run: |
-            echo $ENCODED_STRING | base64 -di > app/ruffle/androidkey.jks
+            echo $ENCODED_STRING | base64 -di > app/androidkey.jks
 
       - name: Build release APK
         if: ${{ !github.event.pull_request.head.repo.fork }}
@@ -107,5 +104,5 @@ jobs:
         if: ${{ !github.event.pull_request.head.repo.fork }}
         with:
           name: ruffle-release-apks
-          path: app/ruffle/build/outputs/apk/release/*.apk
+          path: app/build/outputs/apk/release/*.apk
 

.gitignore

@@ -0,0 +1,12 @@
+*.iml
+.gradle
+/local.properties
+.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+/target
+*.jks

app/.gitignore

@@ -1,15 +1,2 @@
-*.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
+/src/main/jniLibs

app/build.gradle.kts

@@ -0,0 +1,124 @@
+plugins {
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.cargoNdkAndroid).apply(System.getenv("GITHUB_ACTIONS") == null)
+}
+
+android {
+    namespace = "rs.ruffle"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "rs.ruffle"
+        minSdk = 26
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+
+        ndk {
+            abiFilters.addAll(listOf("arm64-v8a", "armeabi-v7a", "x86_64", "x86"))
+        }
+    }
+
+    signingConfigs {
+        create("release") {
+            storeFile = file("androidkey.jks")
+            storePassword = System.getenv("SIGNING_STORE_PASSWORD")
+            keyAlias = System.getenv("SIGNING_KEY_ALIAS")
+            keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            signingConfig = signingConfigs.findByName("release")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    buildFeatures {
+        compose = true
+        prefab = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.1"
+    }
+
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+
+
+    splits {
+        // Configures multiple APKs based on ABI.
+        abi {
+            // Enables building multiple APKs per ABI.
+            isEnable = true
+
+            // Resets the list of ABIs that Gradle should create APKs for to none.
+            reset()
+
+            // Specifies a list of ABIs that Gradle should create APKs for.
+            include("arm64-v8a", "armeabi-v7a", "x86_64", "x86")
+
+            // Specifies that we also want to generate a universal APK that includes all ABIs.
+            isUniversalApk = true
+        }
+    }
+}
+
+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)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.navigation.runtime.ktx)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.games.activity)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.appcompat)
+    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)
+}
+
+// On GHA, we prebuild the native libs separately for fasterness,
+// and this plugin doesn't recognize them, so would build them again.
+if (System.getenv("GITHUB_ACTIONS") == null) {
+    cargoNdk {
+        module = "."
+        apiLevel = 26
+        buildType = "release"
+    }
+}