Skip to content

Commit

Permalink
Improve build system
Browse files Browse the repository at this point in the history
- Update powershell preferred version to 7.5.0
- Update cmake preferred version to 3.31.5
- Move android dependencies versions to build.profiles
  • Loading branch information
halx99 committed Feb 5, 2025
1 parent 3144e47 commit 001089f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
8 changes: 7 additions & 1 deletion 1k/build.profiles
Original file line number Diff line number Diff line change
Expand Up @@ -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+
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 1k/install-pwsh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions core/platform/android/libaxmol/axmol.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 001089f

Please sign in to comment.