release 2.1.0 finally (#1621) [release 2.1.0]

* Delete deprecated prop `buildconfig` from gradle.properties

* Delete unnecessary props since it's value same with defaults

* Don't need config debug keystore, will auto signed by default debug.keystore

* Update funding [skip ci]

* Fix axmol cmdline tool command 'new'

* Refix c99 for winsdk < 10.0.22000.0

* Fix powershell 3 condition statement: 'xxx = if(c) { v1 } else { v2 }' will lost switch parameter semantic

* Improve code style

* Improve code style

* Fixup

Author: halx99

.github/FUNDING.yml

@@ -1,8 +1,8 @@
 # These are supported funding model platforms
 
-github:  # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: axmolengine  # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
+open_collective: axmol # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry

1k/build.ps1

@@ -140,7 +140,7 @@ class build1k {
     }
 
     [void] pause($msg) {
-        $executed_from_explorer = $false
+        $shoud_pause = $false
         do {
             if (!$Global:IsWin) { break }
             $myProcess = [System.Diagnostics.Process]::GetCurrentProcess()
@@ -154,8 +154,14 @@ class build1k {
             }
 
             $executed_from_explorer = ($parentProcess.ProcessName -like "explorer")
+            if ($executed_from_explorer) {
+                $procesCmdLineArgs = "$([System.Environment]::GetCommandLineArgs())"
+                if ($procesCmdLineArgs.IndexOf('.ps1') -ne -1 -and $procesCmdLineArgs.IndexOf('-noexit') -eq -1) {
+                    $shoud_pause = $true
+                }
+            }
         } while ($false)
-        if ($executed_from_explorer) {
+        if ($shoud_pause) {
             $this.print("$msg, press any key to continue . . .")
             cmd /c pause 1>$null
         }

CHANGELOG.md

@@ -119,9 +119,9 @@
 - Include hpp and c files in CMakeLists.txt of cpp template by @@lich426
 - Improve gradle scripts, config each build-variants for easy add custom build-variant, refer #1571
 - Allow to override AX_USE_COMPAT_GL from user's `CMakeLists.txt` by @smilediver
-- Allow generate debug signed apk, and rename keystore props:
+- Fix android gradle AGP8 warnings, and rename keystore props:
   - RELEASE_STORE_FILE ==> KEY_STORE_FILE
-  - KEY_STORE_PASSWORD ==> KEY_STORE_PASSWORD
+  - RELEASE_KEY_STORE_PASSWORD ==> KEY_STORE_PASSWORD
   - RELEASE_KEY_ALIAS ==> KEY_ALIAS
   - RELEASE_KEY_PASSWORD ==> KEY_PASSWORD
 - Enable template projects' `aidl` by default for In-app purchases by @armanhossiny

cmake/Modules/AXConfigDefine.cmake

@@ -37,7 +37,8 @@ if (WINDOWS)
     if (NOT CMAKE_SYSTEM_VERSION)
         set(CMAKE_SYSTEM_VERSION ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION})
     endif()
-    if (${CMAKE_SYSTEM_VERSION} VERSION_GREATER_EQUAL "10.0.22000.0")
+    # CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION aka selected windows sdk version
+    if (${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION} VERSION_GREATER_EQUAL "10.0.22000.0")
         set(CMAKE_C_STANDARD 11)
     else()
         # windows sdk < 10.0.22000.0, The c11 header stdalign.h was missing, so workaroud fallback C standard to 99

setup.ps1

@@ -3,7 +3,7 @@
 $myRoot = $PSScriptRoot
 $AX_ROOT = $myRoot
 
-Set-Alias println Write-Host
+function println($message) { Write-Host "axmol: $message" }
 
 # import VersionEx
 . (Join-Path $PSScriptRoot '1k/extensions.ps1')
@@ -148,10 +148,10 @@ if ($IsWin) {
 
     $execPolicy = powershell -Command 'Get-ExecutionPolicy'
     if ($execPolicy -ne 'Bypass') {
-        println "axmol: Setting system installed powershell execution policy '$execPolicy'==>'Bypass', please click 'YES' on UAC dialog"
+        println "Setting system installed powershell execution policy '$execPolicy'==>'Bypass', please click 'YES' on UAC dialog"
         Start-Process powershell -ArgumentList '-Command "Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Bypass -Force"' -WindowStyle Hidden -Wait -Verb runas
     } else {
-        println "axmol: Great, the system installed powershell execution policy is '$execPolicy'"
+        println "Great, the system installed powershell execution policy is '$execPolicy'"
     }
 }
 else {

templates/cpp-template-default/proj.android/app/build.gradle

@@ -50,7 +50,7 @@ android {
     }
 
     signingConfigs {
-       common {
+       release {
             if (project.hasProperty("KEY_STORE_FILE")) {
                 storeFile file(KEY_STORE_FILE)
                 storePassword KEY_STORE_PASSWORD
@@ -69,17 +69,14 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             if (project.hasProperty("KEY_STORE_FILE")) {
-                signingConfig signingConfigs.common
+                signingConfig signingConfigs.release
             }
         }
 
         debug {
             debuggable true
             jniDebuggable true
             renderscriptDebuggable true
-            if (project.hasProperty("KEY_STORE_FILE")) {
-                signingConfig signingConfigs.common
-            }
         }
     }
 

templates/cpp-template-default/proj.android/gradle.properties

@@ -40,7 +40,3 @@ PROP_APP_ABI=arm64-v8a
 android.injected.testOnly=false
 android.useAndroidX=true
 
-# Update AGP from 7.4.2 to 8.1.1
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=true
-android.nonFinalResIds=true

templates/lua-template-default/proj.android/app/build.gradle

@@ -50,7 +50,7 @@ android {
     }
 
     signingConfigs {
-       common {
+       release {
             if (project.hasProperty("KEY_STORE_FILE")) {
                 storeFile file(KEY_STORE_FILE)
                 storePassword KEY_STORE_PASSWORD
@@ -69,17 +69,14 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             if (project.hasProperty("KEY_STORE_FILE")) {
-                signingConfig signingConfigs.common
+                signingConfig signingConfigs.release
             }
         }
 
         debug {
             debuggable true
             jniDebuggable true
             renderscriptDebuggable true
-            if (project.hasProperty("KEY_STORE_FILE")) {
-                signingConfig signingConfigs.common
-            }
         }
     }
 

templates/lua-template-default/proj.android/gradle.properties

@@ -40,7 +40,3 @@ PROP_APP_ABI=arm64-v8a
 android.injected.testOnly=false
 android.useAndroidX=true
 
-# Update AGP from 7.4.2 to 8.1.1
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=true
-android.nonFinalResIds=true

tests/cpp-tests/proj.android/app/build.gradle

@@ -51,7 +51,7 @@ android {
     }
 
     signingConfigs {
-       common {
+       release {
             if (project.hasProperty("KEY_STORE_FILE")) {
                 storeFile file(KEY_STORE_FILE)
                 storePassword KEY_STORE_PASSWORD
@@ -70,17 +70,14 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             if (project.hasProperty("KEY_STORE_FILE")) {
-                signingConfig signingConfigs.common
+                signingConfig signingConfigs.release
             }
         }
 
         debug {
             debuggable true
             jniDebuggable true
             renderscriptDebuggable true
-            if (project.hasProperty("KEY_STORE_FILE")) {
-                signingConfig signingConfigs.common
-            }
         }
     }