Move manifest.json to 1k/ and update gradle to 9.3.0

Author: halx99

.github/workflows/publish.yml

@@ -50,7 +50,7 @@ jobs:
       run: |
         $AX_ROOT = $(pwd).Path
         ./setup.ps1
-        ./1k/fetch.ps1 -uri 'oboe' -prefix $(Join-Path $AX_ROOT 'cache') -manifest $(Join-Path $AX_ROOT 'manifest.json')
+        ./1k/fetch.ps1 -uri 'oboe' -prefix $(Join-Path $AX_ROOT 'cache') -manifest $(Join-Path $AX_ROOT '1k/manifest.json')
         axmol -xc '-DAX_WITH_LZ4=ON,-DAX_WITH_CARES=ON,-DAX_WITH_YAML_CPP=ON,-DAX_WITH_KCP=ON' -c
         $input_commitish = "${{ github.event.inputs.commitish }}"
         if (!$input_commitish) { $input_commitish = $(git -C $AX_ROOT branch --show-current) }

.gitignore

@@ -171,6 +171,8 @@ tests/lua-tests/project/proj.tizen/res/
 # Ignore extensions/local.cmake
 extensions/local.cmake
 
+/**/*/gradle-daemon-jvm.properties
+
 # Ignore x-studio folder
 .xs
 

1k/1kiss.ps1

@@ -515,7 +515,7 @@ $1k.println("proj_dir=$((Get-Location).Path), install_prefix=$install_prefix")
 # 1kdist
 $sentry_file = Join-Path $PSScriptRoot '.gitee'
 $mirror = if ($1k.isfile($sentry_file)) { 'gitee' } else { 'github' }
-$mirror_conf_file = $1k.realpath("$PSScriptRoot/../manifest.json")
+$mirror_conf_file = $1k.realpath("$PSScriptRoot/manifest.json")
 $mirror_current = $null
 $devtools_url_base = $null
 $1kdist_ver = $null

1k/build.profiles

@@ -10,7 +10,7 @@ axslcc=3.4.0+
 
 # The cmake, @gradle @axmol-cmdline
 # as latest as possible
-cmake=4.2.0~4.2.1+
+cmake=4.2.0~4.2.2+
 
 # The ninja
 ninja=1.10.0~1.13.2+
@@ -58,7 +58,7 @@ min_sdk=21
 
 # The gradle version, @setup.ps1
 # as latest as possible
-gradle=9.2.1
+gradle=9.3.0
 
 # The android gradle plugin, @setup.ps1
 # as stable as possible, match with build-tools,android-studio

1k/fetch.cmake

@@ -17,7 +17,7 @@ function(_1kfetch_init)
   endif()
 
   if(NOT _1kfetch_manifest)
-    file(REAL_PATH "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../manifest.json" _1kfetch_manifest)
+    file(REAL_PATH "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/manifest.json" _1kfetch_manifest)
     set(_1kfetch_manifest "${_1kfetch_manifest}" CACHE STRING "" FORCE)
   endif()
 

manifest.json 1k/manifest.jsonmanifest.json renamed to 1k/manifest.json

@@ -1,6 +1,6 @@
 {
   "versions": {
-    "1kdist": "v110",
+    "1kdist": "v111",
     "oboe": "1.10.0",
     "kcp": "v1.7-f4f3a89",
     "opus": "v1.5.2",
@@ -27,5 +27,9 @@
       "sample-assets": "simdsoft/axmol-sample-assets.git",
       "axslcc": "simdsoft/axslcc/releases/download"
     }
+  },
+  "gradle-mirrors":{
+    "origin": "https://services.gradle.org/distributions",
+    "tencent": "https://mirrors.cloud.tencent.com/gradle"
   }
 }

3rdparty/CMakeLists.txt

@@ -65,7 +65,7 @@ endif()
 add_library(3rdparty INTERFACE)
 
 set(_1kfetch_cache_dir "${_AX_ROOT}/cache" CACHE STRING "" FORCE)
-set(_1kfetch_manifest "${_AX_ROOT}/manifest.json" CACHE STRING "" FORCE)
+set(_1kfetch_manifest "${_AX_ROOT}/1k/manifest.json" CACHE STRING "" FORCE)
 
 # fetch prebuilts of 1kdist and git sources
 include(${_AX_ROOT}/1k/fetch.cmake)

INFRA.md

@@ -19,7 +19,7 @@
 ## gradle
 
 - [![github](https://img.shields.io/github/v/release/gradle/gradle?label=Upstream)](https://github.com/gradle/gradle)
-- Version: 9.2.1
+- Version: 9.3.0
 - License: Apache-2.0
 - Platform: Android
 - Manged by: `1k/build.profiles`

setup.ps1

@@ -3,7 +3,8 @@
 # PowerShell Param statement : every line must end in #\ except the last line must with <#\
 # And, you can't use backticks in this section        #\
 # refer https://gist.github.com/ryanmaclean/a1f3135f49c1ab3fa7ec958ac3f8babe #\
-param( [switch]$updateAdt                    #\
+param( [switch]$updateAdt,                    #\
+    [string]$gradleMirror #\
 )                                                <#\
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `
 #vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
@@ -438,13 +439,18 @@ if ($updateAdt) {
         $gradle_tag = "v$gradleVer"
     }
 
+    if (!$gradleMirror) { $gradleMirror = 'origin' }
+
+    $gradle_base_url = $mirror_conf.'gradle-mirrors'.$gradleMirror
+    $gradle_base_url = $gradle_base_url.Replace(':', "\:")
+
     $gradle_settings_file = Join-Path $aproj_source_gradle_wrapper 'gradle-wrapper.properties'
     $settings_lines = Get-Content $gradle_settings_file
     $settings_lines[0] = "#$current_time"
     for ($i = 1; $i -lt $settings_lines.Count; ++$i) {
         $line_text = $settings_lines[$i]
         if ($line_text -match '^distributionUrl\s*=.*') {
-            $settings_lines[$i] = [Regex]::Replace($line_text, 'gradle-.+-bin.zip', "gradle-$gradleVer-bin.zip")
+            $settings_lines[$i] = "distributionUrl=$gradle_base_url/gradle-$gradleVer-bin.zip"
             break
         }
     }