From 1deddff9b376031fe6667fd53a9b01894a0aa5c6 Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Fri, 3 Mar 2023 15:54:45 +0100
Subject: [PATCH 01/11] Use Java 11 for build

---
 .drone.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 1e101e3..758ddb5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,6 +28,8 @@ steps:
 - name: build
   image: mingc/android-build-box:1.22.0
   commands:
+  - jenv global 11
+  - java -version
   - ./gradlew test
   - ./gradlew assembleRelease
   - ./gradlew bundleRelease
-- 
2.49.1


From 4e100ce727501e5813ba0550adca54c044db35fc Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Fri, 3 Mar 2023 15:57:10 +0100
Subject: [PATCH 02/11] Revert "Use Java 11 for build"

This reverts commit 1deddff9b376031fe6667fd53a9b01894a0aa5c6.
---
 .drone.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 758ddb5..1e101e3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,8 +28,6 @@ steps:
 - name: build
   image: mingc/android-build-box:1.22.0
   commands:
-  - jenv global 11
-  - java -version
   - ./gradlew test
   - ./gradlew assembleRelease
   - ./gradlew bundleRelease
-- 
2.49.1


From e5520620f7ecf6a9ee624ef6bce53b08026e8920 Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Fri, 3 Mar 2023 15:59:45 +0100
Subject: [PATCH 03/11] Set java version trough file.

---
 .java-version | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .java-version

diff --git a/.java-version b/.java-version
new file mode 100644
index 0000000..408e34b
--- /dev/null
+++ b/.java-version
@@ -0,0 +1,5 @@
+11
+# Sets the java version to use via jenv
+# First line must be a java version installed and recognized by `jenv versions`
+# Valid versions are always: 1.8, 11, 11.0, 17, or 17.0
+# Valid versions are sometimes: 1.8.0.352, 11.0.17, 17.0.5
\ No newline at end of file
-- 
2.49.1


From 8dbbeabf4ff9818c47195dc0c9d02825e11bff37 Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Fri, 3 Mar 2023 16:16:27 +0100
Subject: [PATCH 04/11] Delete '.java-version'

---
 .java-version | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .java-version

diff --git a/.java-version b/.java-version
deleted file mode 100644
index 408e34b..0000000
--- a/.java-version
+++ /dev/null
@@ -1,5 +0,0 @@
-11
-# Sets the java version to use via jenv
-# First line must be a java version installed and recognized by `jenv versions`
-# Valid versions are always: 1.8, 11, 11.0, 17, or 17.0
-# Valid versions are sometimes: 1.8.0.352, 11.0.17, 17.0.5
\ No newline at end of file
-- 
2.49.1


From 98aeaf3574cf45d47d24191ac472740b9acd3e28 Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Fri, 3 Mar 2023 16:16:49 +0100
Subject: [PATCH 05/11] Update '.drone.yml'

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 1e101e3..a2c0734 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
-- 
2.49.1


From 8e470f19c3615cd66ad76b2fcccacefb05a2185d Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Fri, 3 Mar 2023 16:18:28 +0100
Subject: [PATCH 06/11] Use Java 17

---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 {
-- 
2.49.1


From 7185c979308f617ace0b31efada32223d9a118b1 Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Sat, 4 Mar 2023 00:34:52 +0100
Subject: [PATCH 07/11] Test upload url

---
 .drone.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a2c0734..2ddd314 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,13 +25,6 @@ steps:
   - let timestamp=$(date +%s)/10 
   - echo "versionCode=$timestamp" >> version.properties
 
-- name: build
-  image: mingc/android-build-box
-  commands:
-  - ./gradlew test
-  - ./gradlew assembleRelease
-  - ./gradlew bundleRelease
-
 - name: deploy latest build
   image: curlimages/curl
   environment:
@@ -42,6 +35,7 @@ steps:
     SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6
   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"'
 
-- 
2.49.1


From 6ff8fd5b9031849be496c237b3ad9f2fcf3e9b8d Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Sat, 4 Mar 2023 00:39:37 +0100
Subject: [PATCH 08/11] Update library id

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 2ddd314..4c1bd04 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -32,7 +32,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 "\"")'
   - echo $UPLOAD_URL
-- 
2.49.1


From 156d3ec29aa4096f0222c73a71c7ff7e66692ab7 Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Sat, 4 Mar 2023 00:42:21 +0100
Subject: [PATCH 09/11] Update library id in tagged step

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 4c1bd04..1c85089 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -46,7 +46,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"'
-- 
2.49.1


From 74b5acbd0eab3cb6a6fb0269854a3b39cdb91fad Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Sat, 4 Mar 2023 00:56:48 +0100
Subject: [PATCH 10/11] Bring build back

---
 .drone.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 1c85089..0f3d8f9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,6 +25,13 @@ steps:
   - let timestamp=$(date +%s)/10 
   - echo "versionCode=$timestamp" >> version.properties
 
+- name: build
+  image: mingc/android-build-box:1.22.0
+  commands:
+  - ./gradlew test
+  - ./gradlew assembleRelease
+  - ./gradlew bundleRelease
+
 - name: deploy latest build
   image: curlimages/curl
   environment:
-- 
2.49.1


From ff2756ae56aa71e465b2040cb46d5c7fb6f13da6 Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Sat, 4 Mar 2023 01:03:20 +0100
Subject: [PATCH 11/11] Get back to latest image.

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 0f3d8f9..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
-- 
2.49.1