Skip to content

Apply suggested update to deps #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jerboa-app merged 5 commits into from
Apr 4, 2026
Merged

Apply suggested update to deps #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9eea57a
Apply suggested update to deps
Jerboa-app Apr 4, 2026
5c15190
Update ci
Jerboa-app Apr 4, 2026
5374543
Crazy gradle nonsense
Jerboa-app Apr 4, 2026
08aaa92
Bump version
Jerboa-app Apr 4, 2026
8deccac
Bump version
Jerboa-app Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ jobs:
mv latest cmdline-tools
yes | ./cmdline-tools/latest/bin/sdkmanager --licenses
./cmdline-tools/latest/bin/sdkmanager "emulator"
./cmdline-tools/latest/bin/sdkmanager --install "system-images;android-34;google_apis;x86_64"
./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-34"
echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android34 --package "system-images;android-34;google_apis;x86_64"
./cmdline-tools/latest/bin/sdkmanager --install "system-images;android-36;google_apis;x86_64"
./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-36"
echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android36 --package "system-images;android-36;google_apis;x86_64"

- name: linux-build
run: |
export JAVA_HOME="/usr/lib/jvm/temurin-17-jdk-amd64"
./gradlew assembleDebugUnsigned

- name: test
run: export JAVA_HOME="/usr/lib/jvm/temurin-17-jdk-amd64" && ./gradlew testDebugUnsignedUnitTest
run: export JAVA_HOME="/usr/lib/jvm/temurin-17-jdk-amd64" && ./gradlew testDebugUnsignedUnitTest -PtestBuildType="debugUnsigned"

# https://github.com/softprops/action-gh-release
- name: release
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
mv latest cmdline-tools
yes | ./cmdline-tools/latest/bin/sdkmanager --licenses
./cmdline-tools/latest/bin/sdkmanager "emulator"
./cmdline-tools/latest/bin/sdkmanager --install "system-images;android-34;google_apis;x86_64"
./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-34"
echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android34 --package "system-images;android-34;google_apis;x86_64"
./cmdline-tools/latest/bin/sdkmanager --install "system-images;android-36;google_apis;x86_64"
./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-36"
echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android36 --package "system-images;android-36;google_apis;x86_64"

- name: linux-build
run: |
Expand All @@ -42,7 +42,7 @@ jobs:
./gradlew assembleDebugUnsigned

- name: test
run: export JAVA_HOME="/usr/lib/jvm/temurin-17-jdk-amd64" && ./gradlew testDebugUnsignedUnitTest
run: export JAVA_HOME="/usr/lib/jvm/temurin-17-jdk-amd64" && ./gradlew testDebugUnsignedUnitTest -PtestBuildType="debugUnsigned"

with-proguard:
runs-on: ubuntu-latest
Expand All @@ -63,15 +63,15 @@ jobs:
mv latest cmdline-tools
yes | ./cmdline-tools/latest/bin/sdkmanager --licenses
./cmdline-tools/latest/bin/sdkmanager "emulator"
./cmdline-tools/latest/bin/sdkmanager --install "system-images;android-34;google_apis;x86_64"
./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-34"
echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android34 --package "system-images;android-34;google_apis;x86_64"
./cmdline-tools/latest/bin/sdkmanager --install "system-images;android-36;google_apis;x86_64"
./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-36"
echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android36 --package "system-images;android-36;google_apis;x86_64"

- name: linux-build
run: |
export JAVA_HOME="/usr/lib/jvm/temurin-17-jdk-amd64"
./gradlew assembleUnsignedProguard

- name: test
run: export JAVA_HOME="/usr/lib/jvm/temurin-17-jdk-amd64" && ./gradlew testUnsignedProguardUnitTest
run: export JAVA_HOME="/usr/lib/jvm/temurin-17-jdk-amd64" && ./gradlew testUnsignedProguardUnitTest -PtestBuildType="unsignedProguard"

39 changes: 22 additions & 17 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'com.google.android.gms.oss-licenses-plugin'
id 'org.jetbrains.kotlin.plugin.compose'
}

def props = new Properties()
Expand All @@ -12,7 +13,7 @@ try {
props.load(new FileInputStream(propsFile))
foundKeys = true
}
catch(e){
catch(ignored){
print("WARNING: key properties not found")
}
finally {
Expand Down Expand Up @@ -42,19 +43,25 @@ android {
}
}

compileSdk 35
compileSdk = 36

defaultConfig {
applicationId "app.jerboa.spp"
minSdk 23
targetSdk 35
versionCode 49
versionName "0.7.1"
minSdk 24
targetSdk 36
versionCode 50
versionName "0.7.2"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary true
}

// ./gradlew testDebugUnsignedUnitTest -PtestBuildType="debugUnsigned"
// https://stackoverflow.com/questions/59890698/how-to-set-testbuildtype-to-active-build-variant-automatically
if (project.hasProperty("testBuildType")) {
testBuildType project.property("testBuildType")
}
}

buildTypes {
Expand Down Expand Up @@ -87,9 +94,7 @@ android {
}
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion compose_compiler_version
buildConfig true
}
packagingOptions {
resources {
Expand All @@ -104,29 +109,29 @@ android.defaultConfig.ndk.debugSymbolLevel = 'FULL'
dependencies {

constraints {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.10") {
because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
}
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.10") {
because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
}
}

implementation 'androidx.core:core-ktx:1.16.0'
implementation 'androidx.core:core-ktx:1.18.0'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.2'
implementation 'androidx.activity:activity-compose:1.10.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.10.0'
implementation 'androidx.activity:activity-compose:1.13.0'
implementation "com.google.android.gms:play-services-games-v2:21.0.0"
implementation 'androidx.appcompat:appcompat:1.7.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
implementation 'com.google.android.gms:play-services-oss-licenses:17.2.1'
implementation 'com.google.android.gms:play-services-oss-licenses:17.4.0'
implementation("com.google.android.play:review:2.0.2")
}
13 changes: 5 additions & 8 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-feature android:glEsVersion="0x00030000" android:required="true" />

<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
Expand All @@ -20,25 +22,20 @@
<activity
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.AppCompat.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
android:theme="@style/Theme.AppCompat" />
<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
android:theme="@style/Theme.AppCompat" />
android:name="com.google.android.gms.oss.licenses.v2.OssLicensesMenuActivity"
android:theme="@style/Theme.AppCompat"
tools:replace="android:theme"/>
</application>

<queries>
<package android:name="com.google.android.play.games" />
</queries>

<uses-feature android:glEsVersion="0x00030000" android:required="true" />

</manifest>
Loading
Loading