From 8e26f6b337511784e33238616b32a8fafd16b28f Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Sat, 4 Mar 2023 08:34:26 +0100 Subject: [PATCH] fixBuild (#30) Reviewed-on: https://gitea.zobrist.me/fabian/TichuCounter/pulls/30 --- .drone.yml | 7 ++++--- app/build.gradle | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1e101e3..1042e9f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,7 +26,7 @@ steps: - echo "versionCode=$timestamp" >> version.properties - name: build - image: mingc/android-build-box:1.22.0 + image: mingc/android-build-box commands: - ./gradlew test - ./gradlew assembleRelease @@ -39,9 +39,10 @@ steps: from_secret: SeafileApiKey APK_FILE: app/build/outputs/apk/release/app-release.apk BUNDLE_FILE: app/build/outputs/bundle/release/app-release.aab - SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6 + SEAFILE_REPO: 6debeef9-121e-46ba-acc7-81e109fdcbdd commands: - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/upload-link/ | tr -d "\"")' + - echo $UPLOAD_URL - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"' @@ -52,7 +53,7 @@ steps: from_secret: SeafileApiKey APK_FILE: app/build/outputs/apk/release/app-release.apk BUNDLE_FILE: app/build/outputs/bundle/release/app-release.aab - SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6 + SEAFILE_REPO: 6debeef9-121e-46ba-acc7-81e109fdcbdd commands: - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/upload-link/ | tr -d "\"")' - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"' diff --git a/app/build.gradle b/app/build.gradle index c74999c..55e0f8f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,11 +72,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '11' + jvmTarget = '17' } namespace 'me.zobrist.tichucounter' packagingOptions {