[CI] [Simulator] Fix CI building (#381)

* [CI] Install more dependencies

* [Simulator] Some upgrades

* [CI] Fix Metrics

* Re-add newlines

.github/workflows/ci-workflow.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install curl git python3 build-essential cmake pkg-config -y
+          sudo apt-get install build-essential cmake libfreetype-dev -y
       - name: Get latest gint commit hash
         run: |
           LATEST_COMMIT_HASH=$(curl --silent https://git.planet-casio.com/api/v1/repos/Lephenixnoir/gint/branches/master | jq -r .commit.id)
@@ -108,6 +108,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
+      - run: sudo apt-get install imagemagick libfreetype-dev libpng-dev
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -223,8 +224,7 @@ jobs:
   bootloader:
     runs-on: ubuntu-latest
     steps:
-      # - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config gcc-arm-none-eabi
-      - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
+      - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config # gcc-arm-none-eabi
       - uses: numworks/setup-arm-toolchain@2022-08
       - uses: actions/checkout@v4
         with:
@@ -298,6 +298,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
+      - run: sudo apt-get install libfreetype-dev libpng-dev
       - run: make -j2 PLATFORM=simulator TARGET=web
       - run: make -j2 PLATFORM=simulator TARGET=web test.js
       - run: node output/release/simulator/web/test.js --headless
@@ -347,6 +348,7 @@ jobs:
     if: github.event.inputs.triggerMacos == 'yes' || github.event.inputs.triggerMacos == ''
     runs-on: macOS-latest
     steps:
+      - run: brew install python-setuptools
       - run: brew install numworks/tap/epsilon-sdk
       - uses: actions/checkout@v4
         with:
@@ -362,6 +364,7 @@ jobs:
     if: github.event.inputs.triggerIos == 'yes' || github.event.inputs.triggerIos == ''
     runs-on: macOS-latest
     steps:
+      - run: brew install python-setuptools
       - run: brew install numworks/tap/epsilon-sdk
       - uses: actions/checkout@v4
         with:

.github/workflows/metric-workflow.yml

@@ -27,12 +27,12 @@ jobs:
         run: make -j2 -C head MODEL=n0110 epsilon.elf
       - name: Retrieve binary size analysis
         id: binary_size
-        run: echo "::set-output name=table::$(python3 head/build/metrics/binary_size.py base/output/release/device/n0110/epsilon.elf head/output/release/device/n0110/epsilon.elf --labels Base Head --sections .text .rodata .bss .data --custom 'Total (RAM)' .data .bss --custom 'Total (ROM)' .text .rodata .data --escape)"
+        run: echo "table=$(python3 head/build/metrics/binary_size.py base/output/release/device/n0110/epsilon.elf head/output/release/device/n0110/epsilon.elf --labels Base Head --sections .text .rodata .bss .data --custom 'Total (RAM)' .data .bss --custom 'Total (ROM)' .text .rodata .data --escape)" >> $GITHUB_OUTPUT
       - name: Add comment
         uses: actions/github-script@v7
         with:
           script: |
-            await github.issues.createComment({
+            await  github.rest.issues.createComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: context.payload.pull_request.number,

ion/src/simulator/android/Makefile

@@ -68,7 +68,7 @@ apk_deps += $(addprefix $(BUILD_DIR)/app/res/,mipmap/ic_launcher.png mipmap-v26/
 
 $(BUILD_DIR)/%.apk: $(apk_deps)
 	$(call rule_label,GRADLE)
-	$(Q) ANDROID_HOME=$(ANDROID_HOME) UPSILON_VERSION=$(UPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) EPSILON_VARIANT=$* ion/src/simulator/android/gradlew -p ion/src/simulator/android assembleRelease
+	$(Q) ANDROID_HOME=$(ANDROID_HOME) UPSILON_VERSION=$(UPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) EPSILON_VARIANT=$* ion/src/simulator/android/gradlew -p ion/src/simulator/android assembleRelease --warning-mode all
 	$(Q) cp $(BUILD_DIR)/app/outputs/apk/release/android-release*.apk $@
 
 endif

ion/src/simulator/android/build.gradle

@@ -16,7 +16,7 @@ buildscript {
     google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.7.1'
+    classpath 'com.android.tools.build:gradle:8.8.1'
   }
 }
 
@@ -54,9 +54,9 @@ android {
       minifyEnabled false
       proguardFiles getDefaultProguardFile('proguard-android.txt')
       if (projectVariable('SIGNING_STORE_FILE')) {
-        signingConfig signingConfigs.environment
+        signingConfig = signingConfigs.environment
       } else {
-        signingConfig signingConfigs.debug
+        signingConfig = signingConfigs.debug
       }
     }
   }
@@ -70,15 +70,15 @@ android {
     }
   }
   lintOptions {
-    abortOnError false
-    checkReleaseBuilds false
+    abortOnError = false
+    checkReleaseBuilds = false
   }
 }
 
 dependencies {
   implementation fileTree(include: ['*.jar'], dir: 'libs')
   implementation "androidx.appcompat:appcompat:1.7.0"
-  implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.21"))
+  implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.1.10"))
 }
 
 java{toolchain{languageVersion=JavaLanguageVersion.of(21)}}

ion/src/simulator/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+

ion/src/simulator/shared/apple/helpers.mak

@@ -39,7 +39,7 @@ SIMULATOR_ICONS = $(addprefix $(SIMULATOR_ICONSET)/,$(addsuffix .png,$(addprefix
 
 $(addprefix $(SIMULATOR_ICONSET)/,icon_%.png): ion/src/simulator/assets/logoMacOS.png | $$(@D)/.
 	$(call rule_label,CONVERT)
-	$(Q) convert -background "#FFB734" -resize $* $< $@
+	$(Q) magick $< -background "#FFB734" -resize $* $@
 
 # Export simulator app dependencies