UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* [CI] Install more dependencies

* [Simulator] Some upgrades

* [CI] Fix Metrics

* Re-add newlines
This commit is contained in:
mickbot-92
2025-02-26 14:05:40 +01:00
committed by GitHub
parent e971681dfd
commit ee8d456f1e
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ion/src/simulator/android/Makefile
View File

@@ -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

12
ion/src/simulator/android/build.gradle
View File

@@ -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)}}

3
ion/src/simulator/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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

2
ion/src/simulator/shared/apple/helpers.mak
View File

@@ -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