From 60ea6e5c9aec7f7159bf01bd5508b5ef1efd0b43 Mon Sep 17 00:00:00 2001 From: mhutti1 Date: Wed, 29 Aug 2018 00:02:51 +0100 Subject: [PATCH 1/5] Remove addaptive icon to fix custom apps --- app/src/main/res/mipmap-anydpi-v26/kiwix_icon.xml | 5 ----- app/src/main/res/mipmap-anydpi-v26/kiwix_icon_round.xml | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 app/src/main/res/mipmap-anydpi-v26/kiwix_icon.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v26/kiwix_icon_round.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/kiwix_icon.xml b/app/src/main/res/mipmap-anydpi-v26/kiwix_icon.xml deleted file mode 100644 index c44280134..000000000 --- a/app/src/main/res/mipmap-anydpi-v26/kiwix_icon.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/kiwix_icon_round.xml b/app/src/main/res/mipmap-anydpi-v26/kiwix_icon_round.xml deleted file mode 100644 index c44280134..000000000 --- a/app/src/main/res/mipmap-anydpi-v26/kiwix_icon_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file From 1ddab91903aed603233c32902d8b6559a12659cb Mon Sep 17 00:00:00 2001 From: Kelson Date: Thu, 30 Aug 2018 22:55:56 +0200 Subject: [PATCH 2/5] More memory for compilation --- gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fdfc80f04..c232e1ce8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,3 @@ android.enableD8=true -android.enableD8.desugaring=true \ No newline at end of file +android.enableD8.desugaring=true +org.gradle.jvmargs=-Xmx4096m From b6957df14c7631f28f2ca38b38dcbb76ca0d370b Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Tue, 11 Sep 2018 23:55:27 +0000 Subject: [PATCH 3/5] Fix versionName ...you'll need to reTag 2.4 after merge --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f35ff9850..e9ffbc0e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -255,7 +255,7 @@ android { if (project.hasProperty('version_name')) { versionName project.property('version_name') } else { - versionName "2.3" + versionName "2.4" } } // Custom apps built from a json file, zim file and icon set @@ -385,4 +385,4 @@ testdroid { fullRunConfig { instrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" } -} \ No newline at end of file +} From 4ef37ef02b1fa335aaac86d0bc3957c2b966789d Mon Sep 17 00:00:00 2001 From: Julian Harty Date: Tue, 18 Sep 2018 15:21:24 +0200 Subject: [PATCH 4/5] Got Code Coverage Reports working while preserving dev debugging! Wow, this 1 line change was painful to discover and apply. Many of the details are in https://github.com/kiwix/kiwix-android/issues/836 NB: We've still to arrange and enable code coverage to be generated in the CI process. --- app/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index e9ffbc0e1..f6d6a669e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -176,6 +176,8 @@ android { cruncherEnabled true } + testBuildType "coverage" + lintOptions { // Treat lint seriously abortOnError true From c28d53bee6fc7e0b578ef29ec68b144da7a12ab8 Mon Sep 17 00:00:00 2001 From: Ritik Kumar <33036254+ritik2017@users.noreply.github.com> Date: Tue, 9 Oct 2018 02:47:13 +0530 Subject: [PATCH 5/5] Updated the gradle files. (#868) * Change the layout_height parameter to more appropriate attribute. * Changed compile to implementation in build.gradle files. --- app/build.gradle | 6 +++--- app/src/main/res/layout/search.xml | 4 ++-- build.gradle | 2 +- gradle.properties | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f6d6a669e..eb41e8e38 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0' + classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.testdroid:gradle:1.5.0' classpath 'org.apache.httpcomponents:httpclient-android:4.3.3' } @@ -50,7 +50,7 @@ dependencies { implementation "com.android.support:cardview-v7:$supportLibraryVersion" implementation 'com.android.support:multidex:1.0.2' - compile 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3' @@ -68,7 +68,7 @@ dependencies { exclude group: 'com.android.support', module: 'recyclerview-v7' } - androidTestCompile('com.schibsted.spain:barista:2.4.0') { + androidTestImplementation('com.schibsted.spain:barista:2.4.0') { exclude group: 'com.android.support' } diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml index 8c912124f..847938591 100644 --- a/app/src/main/res/layout/search.xml +++ b/app/src/main/res/layout/search.xml @@ -15,12 +15,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/toolbar_layout" android:layout_width="match_parent" - android:layout_height="?actionBarSize"> + android:layout_height="?android:attr/actionBarSize"> diff --git a/build.gradle b/build.gradle index 2707b85f6..3d9a8cb45 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0' + classpath 'com.android.tools.build:gradle:3.1.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index c232e1ce8..e3a75b87f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ android.enableD8=true android.enableD8.desugaring=true +org.gradle.configureondemand=false org.gradle.jvmargs=-Xmx4096m