Fix APK paths (#432)
continuous-integration/drone/push Build is passing Details

## What changes were proposed in this pull request?

* Fix APK paths
* Upgrade to Gradle 8.5 & Gradle Plugin 8.2.0

## How was this patch tested?

CI/CD.

Reviewed-on: #432
Co-authored-by: Amab <juanmi1982@gmail.com>
Co-committed-by: Amab <juanmi1982@gmail.com>
This commit is contained in:
Amab 2023-12-02 12:19:36 +01:00 committed by Marown
parent 13b172e37b
commit 957fe8115e
5 changed files with 9 additions and 7 deletions

View File

@ -125,7 +125,7 @@ steps:
# Encrypt keystore & set $RELEASE_KEYSTORE_BASE64 environment variable in Drone CI
# - openssl base64 -A -in keystore.jks
# Decrypt keystore
- echo $RELEASE_KEYSTORE_BASE64 | base64 -d > /drone/src/SWADroid/keystore.jks
- echo $RELEASE_KEYSTORE_BASE64 | base64 -d > SWADroid/keystore.jks
# Assemble APK
- ./gradlew assembleRelease
@ -136,8 +136,8 @@ steps:
from_secret: gitea_api_key
base_url: https://git.cuernodehipnos.es
files:
- /drone/src/SWADroid/SWADroid/build/outputs/apk/release/SWADroid-release.apk
- /drone/src/SWADroid/SWADroid/build/outputs/apk/release/SWADroid-release.apk.idsig
- SWADroid/build/outputs/apk/release/SWADroid-release.apk
- SWADroid/build/outputs/apk/release/SWADroid-release.apk.idsig
checksum:
- md5
- sha1

View File

@ -58,6 +58,9 @@ android {
}
def RELEASE_STORE_FILE = System.getenv("RELEASE_STORE_FILE")
buildFeatures {
buildConfig true
}
if (RELEASE_STORE_FILE) {
signingConfigs {

View File

@ -5,7 +5,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.4'
classpath 'com.android.tools.build:gradle:8.2.0'
}
}

View File

@ -11,7 +11,6 @@
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false

View File

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionSha256Sum=0336f591bc0ec9aa0c9988929b93ecc916b3c1d52aed202c7381db144aa0ef15
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME