diff --git a/1k/build.profiles b/1k/build.profiles index 62437fba8590..0e440dd8f685 100644 --- a/1k/build.profiles +++ b/1k/build.profiles @@ -10,7 +10,7 @@ axslcc=1.9.6+ # The cmake, @gradle @axmol-cmdline # as latest as possible -cmake=3.30.0~3.31.2+ +cmake=3.30.0~3.31.5+ # The ninja ninja=1.10.0~1.12.1+ @@ -69,6 +69,12 @@ build-tools=34.0.0 # as latest as possible, but match with agp, build-tools android-studio=2024.2.1+ +# The android dependencies managed by @gradle +appcompat=1.7.0 +media3=1.2.1 +annotation=1.9.1 +guava=33.3.1 + # --- endregion # --- region platform:wasm diff --git a/1k/install-pwsh.sh b/1k/install-pwsh.sh index e9cd29f2947c..23308122d78d 100755 --- a/1k/install-pwsh.sh +++ b/1k/install-pwsh.sh @@ -12,7 +12,7 @@ mkdir -p $cacheDir pwsh_ver=$1 if [ "$pwsh_ver" = "" ] ; then - pwsh_ver='7.4.6' + pwsh_ver='7.5.0' fi pwsh_min_ver=$2 diff --git a/core/platform/android/libaxmol/axmol.gradle b/core/platform/android/libaxmol/axmol.gradle index 8aaf38d7faf9..1177dd54fc2e 100644 --- a/core/platform/android/libaxmol/axmol.gradle +++ b/core/platform/android/libaxmol/axmol.gradle @@ -174,10 +174,10 @@ class AxmolUtils { buildProfiles['minSdk'] = profiles['min_sdk'] buildProfiles['targetSdk'] = profiles['target_sdk'] buildProfiles['packageName'] = profiles['package_name'] - buildProfiles['appcompat'] = '1.7.0' - buildProfiles['media3'] = '1.2.1' - buildProfiles['annotation'] = '1.9.1' - buildProfiles['guava'] = '33.3.1' + buildProfiles['appcompat'] = profiles['appcompat'] + buildProfiles['media3'] = profiles['media3'] + buildProfiles['annotation'] = profiles['annotation'] + buildProfiles['guava'] = profiles['guava'] return buildProfiles }