From 6715593a1da18931a440b0ff29926124ae1e8b9e Mon Sep 17 00:00:00 2001 From: Gianluca Altomani Date: Wed, 15 Apr 2020 18:38:11 +0000 Subject: [PATCH 1/4] Fixed build by removing Firebase plugins --- metadata/com.gianlu.dnshero.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/metadata/com.gianlu.dnshero.yml b/metadata/com.gianlu.dnshero.yml index d1af240d72..9b4f31a8aa 100644 --- a/metadata/com.gianlu.dnshero.yml +++ b/metadata/com.gianlu.dnshero.yml @@ -10,7 +10,6 @@ SourceCode: https://github.com/devgianlu/DNSHero IssueTracker: https://github.com/devgianlu/DNSHero/issues Translation: https://crowdin.com/project/dnshero Changelog: https://github.com/devgianlu/DNSHero/blob/HEAD/CHANGELOG.md -Donate: https://www.paypal.me/devgianlu LiberapayID: '1381702' AutoName: DNS Hero @@ -197,7 +196,7 @@ Builds: gradle: - foss prebuild: - - sed -i -e '/maven.fabric.io/d; /io.fabric/d; /com.crashlytics/d' ../build.gradle + - sed -i -e '/com.google.firebase/d' ../build.gradle ../CommonUtils/build.gradle build.gradle - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties From 3190dd708914b713cbb37db9d1bbb21bb130ed6e Mon Sep 17 00:00:00 2001 From: devgianlu Date: Sat, 25 Apr 2020 17:42:39 +0200 Subject: [PATCH 2/4] Rewrite --- metadata/com.gianlu.dnshero.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/com.gianlu.dnshero.yml b/metadata/com.gianlu.dnshero.yml index 9b4f31a8aa..38991044c0 100644 --- a/metadata/com.gianlu.dnshero.yml +++ b/metadata/com.gianlu.dnshero.yml @@ -196,8 +196,8 @@ Builds: gradle: - foss prebuild: - - sed -i -e '/com.google.firebase/d' ../build.gradle - ../CommonUtils/build.gradle build.gradle + - sed -i -e '/com.google.firebase/d' ../build.gradle ../CommonUtils/build.gradle + build.gradle - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties AutoUpdateMode: Version v%v From 57e9e34302c6875adf86fda56ccc57fad28b7746 Mon Sep 17 00:00:00 2001 From: devgianlu Date: Tue, 26 May 2020 18:34:42 +0200 Subject: [PATCH 3/4] Added new version --- metadata/com.gianlu.dnshero.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/metadata/com.gianlu.dnshero.yml b/metadata/com.gianlu.dnshero.yml index 38991044c0..555ea08160 100644 --- a/metadata/com.gianlu.dnshero.yml +++ b/metadata/com.gianlu.dnshero.yml @@ -190,6 +190,7 @@ Builds: - versionName: 1.6.4 versionCode: 30 + disable: crashes on startup commit: v1.6.4 subdir: app submodules: true @@ -200,6 +201,20 @@ Builds: build.gradle - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties + - versionName: 1.6.5 + versionCode: 31 + commit: v1.6.5 + subdir: app + submodules: true + gradle: + - foss + prebuild: + - sed -i -e '/com.google.firebase/d' ../build.gradle ../CommonUtils/build.gradle + build.gradle + - sed -i -e '/maven.fabric.io/d; /io.fabric/d' build.gradle ../build.gradle + ../CommonUtils/build.gradle + - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties + AutoUpdateMode: Version v%v UpdateCheckMode: Tags CurrentVersion: 1.6.4 From 8da0395bb8718b18377cc2b9dacffbc8080bd338 Mon Sep 17 00:00:00 2001 From: devgianlu Date: Tue, 26 May 2020 19:28:55 +0200 Subject: [PATCH 4/4] Revert changes to 30 --- metadata/com.gianlu.dnshero.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/com.gianlu.dnshero.yml b/metadata/com.gianlu.dnshero.yml index 555ea08160..6bceb8d0aa 100644 --- a/metadata/com.gianlu.dnshero.yml +++ b/metadata/com.gianlu.dnshero.yml @@ -197,8 +197,8 @@ Builds: gradle: - foss prebuild: - - sed -i -e '/com.google.firebase/d' ../build.gradle ../CommonUtils/build.gradle - build.gradle + - sed -i -e '/maven.fabric.io/d; /io.fabric/d; /com.crashlytics/d' ../build.gradle + ../CommonUtils/build.gradle build.gradle - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties - versionName: 1.6.5