diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index a471867..736ec96 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -21,13 +21,24 @@ jobs: - name: Grant execute permission for Gradle wrapper run: chmod +x ./gradlew - - name: Build signed release APK - env: - KEYSTORE_PATH: KeyStore.jks - KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - run: ./gradlew assembleRelease -Pandroid.injected.signing.store.file=$KEYSTORE_PATH -Pandroid.injected.signing.store.password=$KEYSTORE_PASSWORD -Pandroid.injected.signing.key.alias=$KEY_ALIAS -Pandroid.injected.signing.key.password=$KEY_PASSWORD + - name: Verify AAR File Integrity + run: unzip -t app/libs/firefly-go.aar || (echo "AAR file is corrupted! Fix it in the repo." && exit 1) + + - name: Clean Gradle + run: ./gradlew clean + +# - name: Build signed release APK +# env: +# KEYSTORE_PATH: KeyStore.jks +# KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} +# KEY_ALIAS: ${{ secrets.KEY_ALIAS }} +# KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} +# run: ./gradlew assembleRelease --stacktrace --debug -Pandroid.injected.signing.store.file=$KEYSTORE_PATH -Pandroid.injected.signing.store.password=$KEYSTORE_PASSWORD -Pandroid.injected.signing.key.alias=$KEY_ALIAS -Pandroid.injected.signing.key.password=$KEY_PASSWORD + + - name: Build Release APK + run: | + cd FireflyGo_Android + ./gradlew assembleRelease --stacktrace --debug - name: Upload APK artifact uses: actions/upload-artifact@v4 diff --git a/.idea/.name b/.idea/.name index 0d7df50..c698716 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -FireflyPsAndorid \ No newline at end of file +FireflyGoAndroid \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0e6583c..1edc8df 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,7 +11,7 @@ android { compileSdk = 36 defaultConfig { - applicationId = "com.example.firefly_go_android" + applicationId = "com.kain344.firefly_go_android" minSdk = 24 //noinspection OldTargetApi targetSdk = 35 @@ -32,16 +32,17 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } buildFeatures { compose = true + viewBinding = true } composeOptions { @@ -49,6 +50,10 @@ android { } buildToolsVersion = "36.0.0" ndkVersion = "27.2.12479018" + dependenciesInfo { + includeInApk = false + includeInBundle = false + } } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 82ab511..6b93275 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] activityComposeVersion = "1.11.0" -agp = "8.9.3" +agp = "8.13.0" androidxJunit = "1.3.0" animationCore = "1.9.2" autoupdater = "1.0.1" espressoCoreVersion = "3.7.0" foundation = "1.9.2" -kotlin = "2.0.21" +kotlin = "2.2.20" coreKtx = "1.17.0" junit = "4.13.2" lifecycleRuntimeKtxVersion = "2.9.4" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 39973bf..0e07c39 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Apr 28 17:05:34 ICT 2025 +#Wed Oct 08 15:20:16 ICT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index f8927e0..f937265 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,5 +27,5 @@ dependencyResolutionManagement { } -rootProject.name = "FireflyPsAndorid" +rootProject.name = "FireflyGoAndroid" include(":app")