Android Template Update

Author: danoli3

scripts/templates/android2024/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.9.0'
     }
 }
 

scripts/templates/android2024/gradle.properties

@@ -2,9 +2,10 @@ android.useAndroidX=true
 android.enableJetifier=false
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-android.prefabVersion=1.0.+
+android.prefabVersion=2.1.+
 android.buildFeatures.prefab=true
-#ndkBuild=false
-# https://issuetracker.google.com/149575364
 android.enableParallelJsonGen=false
-#googleplay=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
+googleplay=false

scripts/templates/android2024/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
-#Mon Jun 12 01:17:57 AEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

scripts/templates/android2024/gradle/wrapper/gradle-wrapper.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed May 08 13:54:16 CEST 2024
-sdk.dir=/Users/thierry/Library/Android/sdk
+#Thu Mar 06 00:08:45 AEDT 2025
+sdk.dir=/Users/one/Library/Android/sdk

scripts/templates/android2024/local.properties

@@ -5,10 +5,8 @@ plugins {
 def CMAKELIST_PATH = './src/main/cpp'
 def CPP_SOURCE = './src/main/cpp'
 def JAVA_SOURCE = './src/main/java'
-
-// pointing to cmake's source code for the same project
 def PRJ_SRC_ROOT = './src/main'
-def ofRoot(){ return '../../../../' }
+static def ofRoot(){ return '../../../../' }
 final ofSource = ofRoot() + 'libs/openFrameworks'
 final ofLibs = ofRoot() + 'libs'
 final addons = ofRoot() + 'addons'
@@ -19,7 +17,7 @@ def enableProguardInReleaseBuilds = true
 def enableProguardInDebugBuilds = false
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '7.3.3'
+    gradleVersion = '8.9.0'
 }
 tasks.register("prepareKotlinBuildScriptModel"){
 }
@@ -32,12 +30,11 @@ tasks.whenTaskAdded { task ->
     }
 }
 
-
 android {
     compileSdkVersion 34
-    buildToolsVersion '32.0.0'
+    buildToolsVersion '35.0.0'
     //ndkPath "/Users/x/android-ndk-r21e"  // Point to your own NDK if needed
-    ndkVersion '24.0.8215888' // use android studio side loaded ndk
+    ndkVersion '28.0.13004108' // use android studio side loaded ndk
     buildFeatures {
         prefab true
     }
@@ -46,19 +43,19 @@ android {
         }
         release {
             storeFile new File("${System.properties['user.home']}/.android/debug.keystore")
-            storePassword 'android'
             storeType "jks"
             keyAlias 'androiddebugkey'
-            keyPassword 'android'
+//			storePassword 'android' // <- UPDATE THIS
+//          keyPassword 'android'   // <- UPDATE THIS
         }
     }
     defaultConfig {
         applicationId "cc.openframeworks.emptyExample"  // IMPORTANT : THIS DEFINES THE ID OF THE APK
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 34
         versionCode 12
         versionName '12.0'
-        ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86' //, 'x86_64'
+        ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
 
         externalNativeBuild {
             if (!project.hasProperty("ndkBuild")) {
@@ -118,22 +115,16 @@ android {
             java.srcDirs = ["${PRJ_SRC_ROOT}/java",
                             "${OFX_ANDROID}/Java"]
             res.srcDirs = ["${PRJ_SRC_ROOT}/res"]
-//          jniLibs.srcDirs = ["${OF_ANDROID_OUTPUT}", "lib"] // Pre Android Studio 2022.2.1
             assets {
                 srcDirs 'src/main/assets', 'src/main/bin/data'
             }
         }
     }
     externalNativeBuild {
-        if (!project.hasProperty("ndkBuild")) {
-            cmake {
-                path "${CMAKELIST_PATH}/CMakeLists.txt"
-            }
-        } else {
-            ndkBuild {
-                path "${CMAKELIST_PATH}/Android.mk"
-            }
-        }
+		cmake {
+			path "${CMAKELIST_PATH}/CMakeLists.txt"
+		}
+
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -146,6 +137,7 @@ android {
         includeInApk false
         includeInBundle false
     }
+	namespace 'cc.openframeworks.android'
 //    testOptions {
 //        devices {
 //            pixel2api29 (com.android.build.api.dsl.ManagedVirtualDevice) {
@@ -165,11 +157,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation "com.getkeepsafe.relinker:relinker:1.4.5"
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.12.0'
     if (project.hasProperty("googleplay")) {
         implementation "com.google.android.gms:play-services-games:22.0.1"
         implementation "com.google.android.gms:play-services-auth:20.0.1"

scripts/templates/android2024/ofApp/build.gradle

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.openframeworks.android"
     xmlns:tools="http://schemas.android.com/tools"
     android:versionCode="1"
     android:versionName="1.0" >
@@ -58,7 +57,7 @@
         <meta-data
             android:name="android.max_aspect"
             android:value="2.4" />
-        <!-- Google Play Game Services -->        
+        <!-- Google Play Game Services -->
 <!--        <meta-data-->
 <!--            android:name="com.google.android.gms.games.APP_ID"-->
 <!--            android:value="@string/app_id" />-->
@@ -86,4 +85,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
+</manifest>

scripts/templates/android2024/ofApp/src/main/AndroidManifest.xml

@@ -2,23 +2,19 @@
 # library.
 cmake_minimum_required(VERSION 3.22.1)
 
-project(ofapp LANGUAGES CXX)
+project(ofApp LANGUAGES CXX)
 set(TARGET_ANDROID TRUE)
 
 set(LOCAL_PATH ${CMAKE_SOURCE_DIR})
 set(PRJ_OF_ROOT ${LOCAL_PATH}/../../../../../../../)
-
 set(PURE_OF_ROOT ${LOCAL_PATH}/../../../../../../../)
 set(CORE_OF_ROOT ${PURE_OF_ROOT}/libs/openFrameworks)
 set(LIBS_ROOT ${PURE_OF_ROOT}/libs)
-
 set(PRJ_ADDONS_PATH ${PURE_OF_ROOT}/addons)
 set(PRJ_SOURCE_PATH ${LIBS_ROOT}/openFrameworks)
 set(PRJ_LIBS_ROOT ${PURE_OF_ROOT}/libs)
-
 set(OF_ANDROID ${PURE_OF_ROOT}/libs/openFrameworksCompiled/project/android)
 set(OF_ANDROID_OUTPUT ${PURE_OF_ROOT}/libs/openFrameworksCompiled/lib/android)
-
 set(PRJ_OFX_ANDROID_PATH ${PRJ_ADDONS_PATH}/ofxAndroid)
 set(PRJ_OFX_ANDROID_CPP_PATH ${PRJ_OFX_ANDROID_PATH}/src)
 
@@ -47,31 +43,30 @@ function(check_library)
     endif ()
 endfunction()
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_C_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 set(TARGET_ANDROID ON)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c17 -Oz -DNDEBUG -frtti --warn-uninitialized -fno-short-enums -Wextra -fPIE -fPIC -fuse-ld=gold -fexceptions -ffunction-sections -fdata-sections -Wall -Wextra -Wfloat-equal -Wundef -Werror -fverbose-asm -Wint-to-pointer-cast -Wshadow -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wcast-qual -Wmissing-prototypes -Wstrict-overflow=5 -Wwrite-strings -Wconversion --pedantic-errors")
-set(CMAKE_CPP_FLAGS "${CMAKE_C_FLAGS} -std=c++17 -Oz -DNDEBUG -stdlib=libc++ --warn-uninitialized -frtti -Wextra -fno-short-enums -fPIE -fPIC -fuse-ld=gold -fexceptions -ffunction-sections -fdata-sections -Wall -Wextra -Wfloat-equal -Wundef -Werror -fverbose-asm -Wint-to-pointer-cast -Wshadow -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wcast-qual -Wmissing-prototypes -Wstrict-overflow=5 -Wwrite-strings -Wconversion --pedantic-errors")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ferror-limit=0 -std=c17 -Oz -Wall -fno-short-enums -fPIE -fPIC -fexceptions -ffunction-sections -fdata-sections")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ferror-limit=0 -std=c++23 -Oz -stdlib=libc++ -Wall -fno-short-enums -fPIE -fPIC -fexceptions -ffunction-sections -fdata-sections")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-export-dynamic")
-
 print_all_variables()
-
-# Creates the project's shared lib: libnative-lib.so.
-# The lib is loaded by this project's Java code in MainActivity.java:
-#     System.loadLibrary("native-lib");
-# The lib name in both places must match.
-add_library( ofapp #name
-        SHARED # type of library
+set(OF_LIBRARY_TYPE "SHARED")  # or "STATIC"
+if(OF_LIBRARY_TYPE STREQUAL "SHARED")
+    set(LIB_EXTENSION ".so")
+elseif(OF_LIBRARY_TYPE STREQUAL "STATIC")
+    set(LIB_EXTENSION ".a")
+endif()
+
+add_library( ofApp
+        ${OF_LIBRARY_TYPE}
         # src files for project (just c/cpp)
         ${CMAKE_SOURCE_DIR}/main.cpp
         ${CMAKE_SOURCE_DIR}/ofApp.cpp
-        )
-
+)
 
-# Specifies a path to native header files
 include_directories(
-        # openFrameworks headers
         ${PRJ_SOURCE_PATH}/3d
         ${PRJ_SOURCE_PATH}/app
         ${PRJ_SOURCE_PATH}/communication
@@ -84,59 +79,54 @@ include_directories(
         ${PRJ_SOURCE_PATH}/utils
         ${PRJ_SOURCE_PATH}/video
         ${PRJ_SOURCE_PATH}
-        # openFrameworks addons includes
+        ${PRJ_OFX_ANDROID_CPP_PATH}/
         ${PURE_OF_ROOT}/addons/ofxAndroid/src
         ${PURE_OF_ROOT}/addons/ofxAccelerometer/src
-        ${PURE_OF_ROOT}/addons/ofxXmlSettings/src
-        ${PURE_OF_ROOT}/addons/ofxXmlSettings/libs
-        # openFrameworks Libs includes
         ${PRJ_LIBS_ROOT}/FreeImage/include
         ${PRJ_LIBS_ROOT}/freetype/include
         ${PRJ_LIBS_ROOT}/freetype/include/freetype2
         ${PRJ_LIBS_ROOT}/freetype/include/freetype2/freetype/config
         ${PRJ_LIBS_ROOT}/freetype/include/freetype2/freetype/internal
         ${PRJ_LIBS_ROOT}/freetype/include/freetype2/freetype/internal/services
         ${PRJ_LIBS_ROOT}/glm/include
+        ${PRJ_LIBS_ROOT}/brotli/include
+        ${PRJ_LIBS_ROOT}/json/include
+        ${PRJ_LIBS_ROOT}/libpng/include
+        ${PRJ_LIBS_ROOT}/fmt/include
         ${PRJ_LIBS_ROOT}/pugixml/include
         ${PRJ_LIBS_ROOT}/json/include
         ${PRJ_LIBS_ROOT}/tess2/include
         ${PRJ_LIBS_ROOT}/utf8/include
+        ${PRJ_LIBS_ROOT}/tess2/include
+        ${PRJ_LIBS_ROOT}/zlib/include
         ${PRJ_LIBS_ROOT}/uriparser/include
+        ${PRJ_LIBS_ROOT}/openssl/include
+        ${PRJ_LIBS_ROOT}/curl/include
         ${CMAKE_SOURCE_DIR}/
         ${CMAKE_SOURCE_DIR}/
         ${OF_ANDROID}
 )
 
-find_library(android-lib android)
-find_library(log-lib log)
-find_library(GLES2-lib GLESv2)
-
-#find_library(GLES1-lib GLESv1_CM)
-#find_library(GLES3-lib GLESv3)
-
+find_library(ANDROID_LIB NAMES android)
+find_library(LOG_LIB NAMES log)
+find_library(GLES1_LIB NAMES GLESv1_CM)
+find_library(GLES2_LIB NAMES GLESv2)
+find_library(GLES3_LIB NAMES GLESv3)
 
-target_link_libraries(ofapp
-        EGL
-        GLESv2
+target_link_libraries(ofApp
+        android
         log
-        c
         m
         z
         dl
-#        GLESv3
-        )
-
-target_link_libraries( ofapp
-        ${android-lib} )
-target_link_libraries( ofapp
-        ${GLES2-lib} )
-target_link_libraries( ofapp
-        ${log-lib} )
-#target_link_libraries( ofApp
-#        ${GLES3-lib} )
-#target_link_libraries( ofApp
-#        ${GLES1-lib} )
+)
+target_link_libraries(ofApp
+        ${ANDROID_LIB}
+        ${GLES2_LIB}
+        ${GLES3_LIB}
+        ${GLES1_LIB}
+        ${LOG_LIB}
+)
 
-# Finally link in openFrameworks Library for each ABI
-target_link_libraries( ofapp
-        ${OF_ANDROID_OUTPUT}/${ANDROID_ABI}/libopenFrameworksAndroid.so)
+target_link_libraries( ofApp
+        ${OF_ANDROID_OUTPUT}/${ANDROID_ABI}/libopenFrameworksAndroid${LIB_EXTENSION})

scripts/templates/android2024/ofApp/src/main/cpp/CMakeLists.txt

@@ -22,27 +22,25 @@
 
 public class OFActivity extends cc.openframeworks.OFActivity {
 
-    private static final String appName = "ofapp"; // modify this to target appName (ofApp etc)
+    private static final String appName = "ofApp"; // modify this to target appName (ofApp etc)
     private static final String LOG_TAG = appName + "::OFActivity";
 
-    private ReLinker.Logger logcatLogger = new ReLinker.Logger() {
-        @Override
-        public void log(String message) {
-            Log.d("ReLinker", message);
-        }
-    };
-    private OFActivity thisActivity;
-
 
-    // Extremely important
+	// Extremely important
     public OFActivity() {
         OFAndroidLifeCycle.coreLibraryLoaded = true;
 
         OFAndroid.maxSamples = 4;
         OFAndroid.maximumFrameRate = 144;
 
-        thisActivity = this;
-        ReLinker.log(logcatLogger)
+		OFActivity thisActivity = this;
+		ReLinker.Logger logcatLogger = new ReLinker.Logger() {
+			@Override
+			public void log(String message) {
+				Log.d("ReLinker", message);
+			}
+		};
+		ReLinker.log(logcatLogger)
                 .force()
                 .recursively()
                 .loadLibrary(this, appName, new ReLinker.LoadListener() {