From c0c3781d0d3bb7f839a02a1872e389812b19b1b3 Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 1 Apr 2020 11:22:47 -0700 Subject: [PATCH 01/13] Update CrossWords to version 4.4.155 --- metadata/org.eehouse.android.xw4.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index c2fcf4f511..d579229459 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,7 +390,22 @@ Builds: gradleprops: - forFDroid + - versionName: 4.4.155 + versionCode: 151 + commit: android_beta_155 + subdir: xwords4/android/app + sudo: + - apt update || apt update + - apt install -y graphicsmagick-imagemagick-compat + gradle: + - Xw4fdroid + prebuild: + - sed -i -e '/\/\/ rm-for-fdroid$/d' {..,.}/build.gradle + - sed -i -e '/com.google.gms/d' build.gradle + gradleprops: + - forFDroid + AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.154 -CurrentVersionCode: 150 +CurrentVersion: 4.4.155 +CurrentVersionCode: 151 From 07b3ec3dcf067aada4b123016f9902d3e62d89d7 Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 1 Apr 2020 11:22:47 -0700 Subject: [PATCH 02/13] Update CrossWords to version 4.4.155 --- metadata/org.eehouse.android.xw4.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index c2fcf4f511..d579229459 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,7 +390,22 @@ Builds: gradleprops: - forFDroid + - versionName: 4.4.155 + versionCode: 151 + commit: android_beta_155 + subdir: xwords4/android/app + sudo: + - apt update || apt update + - apt install -y graphicsmagick-imagemagick-compat + gradle: + - Xw4fdroid + prebuild: + - sed -i -e '/\/\/ rm-for-fdroid$/d' {..,.}/build.gradle + - sed -i -e '/com.google.gms/d' build.gradle + gradleprops: + - forFDroid + AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.154 -CurrentVersionCode: 150 +CurrentVersion: 4.4.155 +CurrentVersionCode: 151 From e8e9933d4b0bddb052e117b976b236faad26905d Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 11 Apr 2020 15:35:20 -0700 Subject: [PATCH 03/13] Update CrossWords to version 4.4.156 --- metadata/org.eehouse.android.xw4.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index d579229459..9e625a33ec 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,9 +390,9 @@ Builds: gradleprops: - forFDroid - - versionName: 4.4.155 - versionCode: 151 - commit: android_beta_155 + - versionName: 4.4.156 + versionCode: 152 + commit: android_beta_156 subdir: xwords4/android/app sudo: - apt update || apt update @@ -407,5 +407,5 @@ Builds: AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.155 -CurrentVersionCode: 151 +CurrentVersion: 4.4.156 +CurrentVersionCode: 152 From d797017228bbc87b22bf99a9bc83d1328e94bae8 Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 1 Apr 2020 11:22:47 -0700 Subject: [PATCH 04/13] Update CrossWords to version 4.4.155 --- metadata/org.eehouse.android.xw4.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index c2fcf4f511..d579229459 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,7 +390,22 @@ Builds: gradleprops: - forFDroid + - versionName: 4.4.155 + versionCode: 151 + commit: android_beta_155 + subdir: xwords4/android/app + sudo: + - apt update || apt update + - apt install -y graphicsmagick-imagemagick-compat + gradle: + - Xw4fdroid + prebuild: + - sed -i -e '/\/\/ rm-for-fdroid$/d' {..,.}/build.gradle + - sed -i -e '/com.google.gms/d' build.gradle + gradleprops: + - forFDroid + AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.154 -CurrentVersionCode: 150 +CurrentVersion: 4.4.155 +CurrentVersionCode: 151 From 150b650f148805095a93ccdc88e54049d752a1a7 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 11 Apr 2020 15:35:20 -0700 Subject: [PATCH 05/13] Update CrossWords to version 4.4.156 --- metadata/org.eehouse.android.xw4.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index d579229459..9e625a33ec 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,9 +390,9 @@ Builds: gradleprops: - forFDroid - - versionName: 4.4.155 - versionCode: 151 - commit: android_beta_155 + - versionName: 4.4.156 + versionCode: 152 + commit: android_beta_156 subdir: xwords4/android/app sudo: - apt update || apt update @@ -407,5 +407,5 @@ Builds: AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.155 -CurrentVersionCode: 151 +CurrentVersion: 4.4.156 +CurrentVersionCode: 152 From 9d172b8587af19d6918cf25946d8ec85a3670dcb Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 18 Apr 2020 17:40:39 -0700 Subject: [PATCH 06/13] Update CrossWords to version 4.4.157 --- metadata/org.eehouse.android.xw4.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index 9e625a33ec..2f08347257 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,9 +390,9 @@ Builds: gradleprops: - forFDroid - - versionName: 4.4.156 - versionCode: 152 - commit: android_beta_156 + - versionName: 4.4.157 + versionCode: 153 + commit: android_beta_157 subdir: xwords4/android/app sudo: - apt update || apt update @@ -407,5 +407,5 @@ Builds: AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.156 -CurrentVersionCode: 152 +CurrentVersion: 4.4.157 +CurrentVersionCode: 153 From e23a06764f646e20cd702bebc9739e2791959b23 Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 1 Apr 2020 11:22:47 -0700 Subject: [PATCH 07/13] Update CrossWords to version 4.4.155 --- metadata/org.eehouse.android.xw4.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index c2fcf4f511..d579229459 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,7 +390,22 @@ Builds: gradleprops: - forFDroid + - versionName: 4.4.155 + versionCode: 151 + commit: android_beta_155 + subdir: xwords4/android/app + sudo: + - apt update || apt update + - apt install -y graphicsmagick-imagemagick-compat + gradle: + - Xw4fdroid + prebuild: + - sed -i -e '/\/\/ rm-for-fdroid$/d' {..,.}/build.gradle + - sed -i -e '/com.google.gms/d' build.gradle + gradleprops: + - forFDroid + AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.154 -CurrentVersionCode: 150 +CurrentVersion: 4.4.155 +CurrentVersionCode: 151 From f5542bd1a4b9c8f41648a5b4b39e6a3827539f36 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 11 Apr 2020 15:35:20 -0700 Subject: [PATCH 08/13] Update CrossWords to version 4.4.156 --- metadata/org.eehouse.android.xw4.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index d579229459..9e625a33ec 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,9 +390,9 @@ Builds: gradleprops: - forFDroid - - versionName: 4.4.155 - versionCode: 151 - commit: android_beta_155 + - versionName: 4.4.156 + versionCode: 152 + commit: android_beta_156 subdir: xwords4/android/app sudo: - apt update || apt update @@ -407,5 +407,5 @@ Builds: AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.155 -CurrentVersionCode: 151 +CurrentVersion: 4.4.156 +CurrentVersionCode: 152 From 28a505b8eb8bd1560b1dbd5b7ea592e7a4ae308b Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 1 Apr 2020 11:22:47 -0700 Subject: [PATCH 09/13] Update CrossWords to version 4.4.155 --- metadata/org.eehouse.android.xw4.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index 9e625a33ec..d579229459 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,9 +390,9 @@ Builds: gradleprops: - forFDroid - - versionName: 4.4.156 - versionCode: 152 - commit: android_beta_156 + - versionName: 4.4.155 + versionCode: 151 + commit: android_beta_155 subdir: xwords4/android/app sudo: - apt update || apt update @@ -407,5 +407,5 @@ Builds: AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.156 -CurrentVersionCode: 152 +CurrentVersion: 4.4.155 +CurrentVersionCode: 151 From 6d0f07a764a9edefa9b435cf3b18bd0137974eef Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 11 Apr 2020 15:35:20 -0700 Subject: [PATCH 10/13] Update CrossWords to version 4.4.156 --- metadata/org.eehouse.android.xw4.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index d579229459..9e625a33ec 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,9 +390,9 @@ Builds: gradleprops: - forFDroid - - versionName: 4.4.155 - versionCode: 151 - commit: android_beta_155 + - versionName: 4.4.156 + versionCode: 152 + commit: android_beta_156 subdir: xwords4/android/app sudo: - apt update || apt update @@ -407,5 +407,5 @@ Builds: AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.155 -CurrentVersionCode: 151 +CurrentVersion: 4.4.156 +CurrentVersionCode: 152 From 2bbe9a8f7cde7ea3704cd23ed8b73a981f4da737 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 18 Apr 2020 17:40:39 -0700 Subject: [PATCH 11/13] Update CrossWords to version 4.4.157 --- metadata/org.eehouse.android.xw4.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index 9e625a33ec..2f08347257 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,9 +390,9 @@ Builds: gradleprops: - forFDroid - - versionName: 4.4.156 - versionCode: 152 - commit: android_beta_156 + - versionName: 4.4.157 + versionCode: 153 + commit: android_beta_157 subdir: xwords4/android/app sudo: - apt update || apt update @@ -407,5 +407,5 @@ Builds: AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.156 -CurrentVersionCode: 152 +CurrentVersion: 4.4.157 +CurrentVersionCode: 153 From 7badfbe1467267d74ea84494cd7fe49643e804f3 Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 6 May 2020 11:16:56 -0700 Subject: [PATCH 12/13] Update CrossWords to version 4.4.159 --- metadata/org.eehouse.android.xw4.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index 2f08347257..f694f3c09d 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -390,9 +390,9 @@ Builds: gradleprops: - forFDroid - - versionName: 4.4.157 - versionCode: 153 - commit: android_beta_157 + - versionName: 4.4.159 + versionCode: 155 + commit: android_beta_159 subdir: xwords4/android/app sudo: - apt update || apt update @@ -407,5 +407,5 @@ Builds: AutoUpdateMode: None UpdateCheckMode: Tags ^android -CurrentVersion: 4.4.157 -CurrentVersionCode: 153 +CurrentVersion: 4.4.159 +CurrentVersionCode: 155 From 3ac993afa3a56d0ba1d3d5b5d2620d0a74d60a88 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 7 May 2020 13:17:26 +0200 Subject: [PATCH 13/13] crosswords: use correct ndk --- metadata/org.eehouse.android.xw4.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/metadata/org.eehouse.android.xw4.yml b/metadata/org.eehouse.android.xw4.yml index f694f3c09d..9fe1ee6636 100644 --- a/metadata/org.eehouse.android.xw4.yml +++ b/metadata/org.eehouse.android.xw4.yml @@ -402,6 +402,7 @@ Builds: prebuild: - sed -i -e '/\/\/ rm-for-fdroid$/d' {..,.}/build.gradle - sed -i -e '/com.google.gms/d' build.gradle + ndk: r21 gradleprops: - forFDroid