From 12ac52b10cd519f31f72dc81fce8078b75e5a115 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:26:48 +0100 Subject: [PATCH 01/20] CI: add build apk --- .github/workflows/build.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..00341f3 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,23 @@ +name: Build APK + +on: workflow_dispatch + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Gradle + run: ./gradlew build + - name: Build Release APK + run: ./gradlew assembleRelease + - name: Upload + uses: actions/upload-artifact@v2 + with: + name: Build Artifacts + path: app/build/outputs/ + From 90df37d75509c9706ef2857f0c4b165158f74edb Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:32:00 +0100 Subject: [PATCH 02/20] Up gradle version to min required --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8674409..56c03e4 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.2.1' } } From 161897b04e7487415ef54ba5c1f4a74c52048431 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:34:33 +0100 Subject: [PATCH 03/20] Add google repox --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 56c03e4..574520b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ buildscript { repositories { jcenter() + google() } dependencies { classpath 'com.android.tools.build:gradle:3.2.1' From 4b4d9dad4879760556106a020975ba6d8827384a Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:39:56 +0100 Subject: [PATCH 04/20] Add google repo address --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 574520b..dccfcec 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,9 @@ buildscript { repositories { jcenter() - google() + maven { + url 'https://maven.google.com' + } } dependencies { classpath 'com.android.tools.build:gradle:3.2.1' From 12904f2e8501bd3bfb41538e1a4cc3bb830306eb Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:40:39 +0100 Subject: [PATCH 05/20] Build APK on every push --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00341f3..f66cc37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: Build APK -on: workflow_dispatch +on: push jobs: build: From 50083f583f5b425471b3384549d0999e2468864a Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:42:51 +0100 Subject: [PATCH 06/20] Bump Gradle to minimum supported v4.6x --- gradle/wrapper/gradle-wrapper.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8e6d28b..3f0f9be 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Oct 22 22:24:17 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip From 80edbd74fcbdb5d9d7330eb1e0b9d193995ae853 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:45:28 +0100 Subject: [PATCH 07/20] Bump Gradle to latest 7.0.0x --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index dccfcec..7fa5ceb 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:7.0.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3f0f9be..bfa9995 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.0-all.zip From 2d9e8db24b48131527a7d736cd05c6391b63fa34 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:48:01 +0100 Subject: [PATCH 08/20] Bump Gradle plugin tox 7.0.4 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7fa5ceb..b30925c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.0.4' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bfa9995..1bd5be8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip From 2a7a36d8a7e5e5fe18e3337a4126d004e3c77141 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:52:07 +0100 Subject: [PATCH 09/20] Gradle plugin 7.0.4 needs gradle 7.0.2. Of course...x --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1bd5be8..297f2fe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip From 14ad73c21426cec884e029c417ab3df13b1ee0aa Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:54:25 +0100 Subject: [PATCH 10/20] Bump Java SDK to 11 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f66cc37..257570f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,10 +7,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Build with Gradle run: ./gradlew build - name: Build Release APK From 808d18b876504351e5a865084444b230ce1c2b12 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 20:58:46 +0100 Subject: [PATCH 11/20] Java needs to be dragged behind the barn and shot --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b30925c..7fa5ceb 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.0.0' } } From 1bfeb0ec11f60f38e83c9e6e455e5aada3fb97d3 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 21:00:24 +0100 Subject: [PATCH 12/20] Java needs to be dragged behind the barn and shot --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7fa5ceb..c15bb1a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.0' } } From ceac3c0fafa9d55ce54173197bb477426ab49591 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 21:02:50 +0100 Subject: [PATCH 13/20] Java needs to be dragged behind the barn and shot --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c15bb1a..da52a7d 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:7.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } From fbf13a0e611cd9398696ab58a7c285a87033fb34 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 21:07:14 +0100 Subject: [PATCH 14/20] Java needs to be dragged behind the barn and shot --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index da52a7d..7130256 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,9 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { + google() + // jcenter() + mavenCentral() jcenter() maven { url 'https://maven.google.com' From ebe75cae3489130a115992345a4293fe574b49e9 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 21:09:36 +0100 Subject: [PATCH 15/20] Java needs to be dragged behind the barn and shot --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7130256..b29c799 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,7 @@ buildscript { repositories { google() - // jcenter() mavenCentral() - jcenter() maven { url 'https://maven.google.com' } @@ -16,6 +14,8 @@ buildscript { allprojects { repositories { + google() + mavenCentral() jcenter() } } From f0875471881d3f826e7209441f47a55773775755 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 21:13:05 +0100 Subject: [PATCH 16/20] Java needs to be dragged behind the barn and shot --- app/src/main/AndroidManifest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b8f0776..eb26968 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,6 @@ android:versionName="1.3" > @@ -72,4 +71,4 @@ - \ No newline at end of file + From d0987e84151b40a7227f3770ccf567f80a10a655 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 21:18:10 +0100 Subject: [PATCH 17/20] Java needs to be dragged behind the barn and shot --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index eb26968..edffddb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionName="1.3" > + android:targetSdkVersion="29" /> From 6d07a84ce703fa75ea9c4474b60096255d029fa2 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 21:20:25 +0100 Subject: [PATCH 18/20] Java needs to be dragged behind the barn and shot --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b6e8208..99e6d63 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { applicationId "net.zekjur.davsync" minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 29 } buildTypes { From bf3c03a87e93b07088482b1c8aa9cc30601c3936 Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 21:23:13 +0100 Subject: [PATCH 19/20] Java needs to be dragged behind the barn and shot --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 99e6d63..10bb747 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 22 + compileSdkVersion 29 buildToolsVersion '25.0.0' defaultConfig { From d478fb3d36a2e07bf247e40216502a19666e07cb Mon Sep 17 00:00:00 2001 From: Herbert Knapp <42992894+HMKnapp@users.noreply.github.com> Date: Mon, 24 Jan 2022 21:27:05 +0100 Subject: [PATCH 20/20] Add only release apk artifact --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 257570f..8730e2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,6 @@ jobs: - name: Upload uses: actions/upload-artifact@v2 with: - name: Build Artifacts - path: app/build/outputs/ + name: android-davsync + path: app/build/outputs/apk/release/app-release-unsigned.apk