Lots of updates

This updates many of the examples to:
- android-activity 0.6.1
- use Gradle 9, and AGP 9.1
- icon updates
- Egui 0.33 (where applicable)
- wgpu 0.29 (where applicable)

Author: rib

agdk-cpal/Cargo.lock

@@ -6,13 +6,22 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-log = "0.4"
-android_logger = "0.11.0"
-android-activity = { version = "0.4", features = ["game-activity"] }
-cpal = "0.15"
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = [
+    "fmt",
+    "env-filter",
+    "tracing-log",
+] }
+paranoid-android = "0.2"
+tracing-log = "0.2"
+
+android-activity = { version = "0.6", features = ["game-activity"] }
+ndk-sys = "0.6"
+ndk = "0.9"
+cpal = "0.17"
 atomic_float = "0.1"
 anyhow = "1"
 
 [lib]
-name="main"
-crate_type=["cdylib"]
+name = "main"
+crate-type = ["cdylib"]

agdk-cpal/Cargo.toml

@@ -9,8 +9,8 @@ export ANDROID_HOME="path/to/sdk"
 rustup target add aarch64-linux-android
 cargo install cargo-ndk
 
-cargo ndk -t arm64-v8a -o app/src/main/jniLibs/  build
+cargo ndk -t arm64-v8a -P 31 -o app/src/main/jniLibs/  build
 ./gradlew build
 ./gradlew installDebug
-adb shell am start -n co.realfit.agdkcpal/.MainActivity
+adb shell am start -n com.github.rust_mobile.agdkcpal/.MainActivity
 ```

agdk-cpal/README.md

@@ -3,61 +3,43 @@ plugins {
 }
 
 android {
-    ndkVersion "25.2.9519653"
-    compileSdk 31
+    compileSdk = 35
 
     defaultConfig {
-        applicationId "co.realfit.agdkcpal"
-        minSdk 28
-        targetSdk 31
-        versionCode 1
-        versionName "1.0"
+        applicationId = "com.github.rust_mobile.agdkcpal"
+        minSdk = 31
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
-            minifyEnabled false
+            minifyEnabled = false
             //packagingOptions {
             //    doNotStrip '**/*.so'
             //}
             //debuggable true
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-    namespace 'co.realfit.agdkcpal'
+    namespace = 'com.github.rust_mobile.agdkcpal'
 }
 
 dependencies {
-
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-
-    // To use the Android Frame Pacing library
-    //implementation "androidx.games:games-frame-pacing:1.9.1"
-
-    // To use the Android Performance Tuner
-    //implementation "androidx.games:games-performance-tuner:1.5.0"
+    implementation 'androidx.appcompat:appcompat:1.7.0'
 
     // To use the Games Activity library
-    implementation "androidx.games:games-activity:1.1.0"
-
-    // To use the Games Controller Library
-    //implementation "androidx.games:games-controller:1.1.0"
-
-    // To use the Games Text Input Library
-    //implementation "androidx.games:games-text-input:1.1.0"
+    implementation "androidx.games:games-activity:4.4.0"
+    // Note: don't include game-text-input separately, since it's integrated into game-activity
 }
 

agdk-cpal/app/build.gradle

@@ -2,12 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="AGDK Cpal"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.RustTemplate">
+        android:theme="@style/ActivityTheme">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"

agdk-cpal/app/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-package co.realfit.agdkcpal;
+package com.github.rust_mobile.agdkcpal;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.WindowCompat;
@@ -28,7 +28,7 @@ public class MainActivity extends GameActivity {
 
         // Load the native library.
         // The name "android-game" depends on your CMake configuration, must be
-        // consistent here and inside AndroidManifect.xml
+        // consistent here and inside AndroidManifest.xml
         System.loadLibrary("main");
     }
 

…va/co/realfit/agdkcpal/MainActivity.java …b/rust_mobile/agdkcpal/MainActivity.javaagdk-cpal/app/src/main/java/co/realfit/agdkcpal/MainActivity.java renamed to agdk-cpal/app/src/main/java/com/github/rust_mobile/agdkcpal/MainActivity.java agdk-cpal/app/src/main/java/co/realfit/agdkcpal/MainActivity.java renamed to agdk-cpal/app/src/main/java/com/github/rust_mobile/agdkcpal/MainActivity.java

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>