Commit Graph

65 Commits

Author SHA1 Message Date
halx99 68a5c250cd Fix build android with axmol cmdline arch not working 2024-04-09 01:37:04 +08:00
halx99 320124487e Update gradlew scripts 2024-04-08 23:29:45 +08:00
halx99 bc1bab5a98 Update AGP 8.2.2
- gradle: 8.5 ==> 8.7
- gradle-wapper.jar: NA ==> 8.7
- cmdlinetools: 10406996 ==> 11076708
2024-04-07 02:08:00 +08:00
Deal adbffdf4a2
Fix #1704, control android cmake options by engine axutils.gradle (#1705) 2024-02-20 00:58:47 +08:00
halx99 c06bed508b Rename cocos_android_app_init to axmol_android_app_init and othre code cleanup 2024-01-29 08:51:35 +08:00
Deal 9ec7c54c57
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
2024-01-20 16:16:53 +08:00
halx99 bef10d0dea Allow generated debug signed apk, and rename keystore props:
- RELEASE_STORE_FILE ==> KEY_STORE_FILE
- KEY_STORE_PASSWORD ==> KEY_STORE_PASSWORD
- RELEASE_KEY_ALIAS ==> KEY_ALIAS
- RELEASE_KEY_PASSWORD ==> KEY_PASSWORD
2024-01-17 03:50:13 +08:00
halx99 32ef79a9f5 Avoid define multi depends of gradle task copyContentToAssets
refer: dd7c9deaf9
2024-01-17 03:45:13 +08:00
halx99 d3e680bc52 Update Android devtools
- AGP 8.2.1
- Android Studio 2023.1.1+
- Android SDK Tools 34.0.0
- Android SDK Platform 34
- Gradle 8.5
2024-01-17 02:59:40 +08:00
halx99 dd7c9deaf9 Improve android build gradle script
- Merge tasks copyDebugContentToAssets, copyReleaseContentToAssets to copyContentAssets
- Simplify tasks dependent definations
- Fix tests content not pack into apk
2024-01-16 00:47:19 +08:00
Deal 159f49d832 Fix #1498 (#1500) 2023-12-12 00:44:59 +08:00
halx99 affcf05b69 Prepare 2.1.0 release
* Update copyright notice
* Remove prebuilt libs from SCM
* Remove optional thirdparty sources/repo from SCM
* Remove tests resources  folder 'Content' from SCM
2023-12-08 01:04:43 +08:00
CHP 13ec866867 Update android API to 34 (#1469)
* Update gradle.properties

* Update android api to from 33 to 34
2023-12-01 08:08:37 +08:00
RH a503004418 [Android] Restrict temporary and generated files to build folder (#1368)
* [Android] Restrict temporary and generated files to build folder

* Fix temporary axslc folder path
2023-10-02 09:47:11 +08:00
halx99 f2470b99aa Android: Update AGP to 8.1.1
- jdk-17.x+ required
- gradle-bin 8.3
- Build-Tools 33.0.1
-  Delete package name from AndroidManifest.xml
- Add namespace "org.axmol.xxx" in 'app/build.gradle'
- Rename compileSdkVersion ==> compileSdk in 'app/build.gradle'
- Use rootProject.layout.buildDirectory instead rootProject.buildDir
- Android Studio 2022.3.1+
2023-09-12 01:13:06 +08:00
halx99 c66ac9dedc Merge: 41714a04fd 2631c8405b
Merge branch '1.x' into dev
2023-09-02 19:56:50 +08:00
halx99 b21fcb0272 Fix gendocs.ps1 2023-09-02 19:56:33 +08:00
halx99 8f8418c15d Merge: c8bfa8cdf1 062b510c38
Merge 1.x WASM support into 'dev'
2023-09-02 19:47:18 +08:00
nowasm 03f007fdbe Add webgl aka wasm build support (#1315) 2023-09-01 16:31:14 +08:00
halx99 4c0c328b80 Merge: 6d82d3a76c 5e3cba78a6
Merge branch '1.x' into dev
2023-09-01 16:29:02 +08:00
halx99 396313de47 consle-next: Looking both powershell 7.x and 5.x 2023-09-01 16:28:34 +08:00
iAndyHD3 ed39cf3996 Update AXBuildHelpers.cmake (#1316)
fix find_program call
2023-09-01 16:09:58 +08:00
halx99 b1ddb2fcce Sync #1316 2023-09-01 16:09:27 +08:00
halx99 a000ccbab5 Update site build 2023-09-01 14:49:03 +08:00
halx99 ada7deb002 Sync docs [skip ci] 2023-09-01 14:48:42 +08:00
halx99 310c5868ec Merge: 8f8814532d bdbbc55909
Merge branch '1.x' into dev
2023-09-01 13:36:38 +08:00
halx99 e5d984a4f8 Auto deploy wasm demo to gh pages 2023-09-01 13:36:23 +08:00
halx99 5fe4e6d61f Merge: 89955d901a 279ea746cc
Merge branch '1.x' into dev
2023-09-01 10:37:57 +08:00
halx99 e565645443 Auto get release list for doc build 2023-09-01 10:31:34 +08:00
halx99 f3f91147a3 Merge: 2a6e84aa15 2969a5b4ff
Merge branch '1.x' into dev
2023-09-01 03:35:30 +08:00
halx99 fe60bf0a1b Fix cmake setup for linux 2023-09-01 01:17:49 +08:00
halx99 ec9b7f6e42 Merge: 1d4deae63a 7399ac41a6
Merge branch '1.x' into dev
2023-09-01 01:07:15 +08:00
halx99 0094c6bbb2 keep files for site build [skip ci] 2023-08-31 22:08:50 +08:00
halx99 2566feff5a Merge: 6e1be139bd 1d26aa28a5
Merge branch '1.x' into dev
2023-08-31 21:20:23 +08:00
halx99 12bb1eb62a Improve axmol site build 2023-08-31 21:20:01 +08:00
halx99 b50c629307 Merge: bdf976681e 82679fca74
Merge branch '1.x' into dev
2023-08-31 19:56:21 +08:00
Deal c8d0fb85ea Fix linux build 2023-08-31 18:59:12 +08:00
halx99 0952acea6a Merge: 4fe5dd55e7 cc826cb6ae
Merge branch '1.x' into dev
2023-08-31 18:14:46 +08:00
halx99 b97b1a5630 Fix ci 2023-08-31 18:14:26 +08:00
halx99 06d51ac961 Merge: d3f55e0472 8e723b0cc9
Merge branch '1.x' into dev
2023-08-31 18:09:23 +08:00
halx99 4a52c781a2 Fix ci 2023-08-31 18:07:23 +08:00
halx99 09db3594f2 Merge: 3d97d1bcc1 0a63a8e364
Merge branch '1.x' into dev
2023-08-31 17:57:36 +08:00
halx99 a3a117ad2d Update script permision 2023-08-31 17:57:19 +08:00
halx99 449a596f3e Merge: fd2cbdc331 a816a8ac64
Merge branch '1.x' into dev

# Conflicts:
#       README.md
#       README_CN.md
#       install-pwsh.sh
#       tools/console/axmol
2023-08-31 17:56:09 +08:00
halx99 c2e55c4cdc Merge console-next from dev into 1.x 2023-08-31 17:48:39 +08:00
halx99 5183995a36 Merge: f9b6553e57 94be720d3f
Merge branch '1.x' into dev
2023-08-25 16:57:54 +08:00
halx99 2bf41d7d31 Fix ci 2023-08-25 16:57:38 +08:00
halx99 46f668b01b Remove render backend setLineWidth [skip ci]
Due to not all of GL and Metal support it, so remove it unify behavior
developers shouldn't relay on it
2023-08-25 16:49:08 +08:00
halx99 f525d6c726 Update docs 2023-08-25 16:46:32 +08:00
halx99 a7011c2bcd Fix axslc sync 2023-08-21 13:39:56 +08:00