diff --git a/metadata/com.jbirdvegas.mgerrit.txt b/metadata/com.jbirdvegas.mgerrit.txt index 419daf07e7..4166381347 100644 --- a/metadata/com.jbirdvegas.mgerrit.txt +++ b/metadata/com.jbirdvegas.mgerrit.txt @@ -21,7 +21,6 @@ Repo Type:git Repo:https://github.com/JBirdVegas/external_jbirdvegas_mGerrit.git Build:2.111.72,2111072 - disable=apk crashes commit=2.111.72 subdir=app patch=f-droid.2.111.72.diff diff --git a/metadata/com.jbirdvegas.mgerrit/f-droid.2.111.72.diff b/metadata/com.jbirdvegas.mgerrit/f-droid.2.111.72.diff index 110aed248d..ea6fb50da6 100644 --- a/metadata/com.jbirdvegas.mgerrit/f-droid.2.111.72.diff +++ b/metadata/com.jbirdvegas.mgerrit/f-droid.2.111.72.diff @@ -1,5 +1,5 @@ diff --git a/app/build.gradle b/app/build.gradle -index 2967568..a7ca1c1 100644 +index 2967568..a26a43d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ buildscript { @@ -22,25 +22,21 @@ index 2967568..a7ca1c1 100644 compile 'com.android.support:appcompat-v7:23.1.1' compile 'com.android.support:design:23.1.1' -@@ -49,15 +49,9 @@ dependencies { +@@ -49,12 +49,7 @@ dependencies { } compile 'de.hdodenhof:circleimageview:1.2.2' -/* TODO: Enable this when the Android variant of the Gerrit Rest Java Client is officially released - The corresponding jar can then be removed - compile('com.urswolfer.gerrit.client.rest:gerrit-rest-java-client:0.8.6-android') { -+ compile('com.urswolfer.gerrit.client.rest:gerrit-rest-java-client:0.8.6') { - exclude module: 'httpclient' +- exclude module: 'httpclient' - }*/ - compile files('libs/gerrit-rest-java-client-0.8.6-android.jar') -- // These are dependencies of the gerrit-rest-java-client library above -- compile 'com.google.guava:guava:18.0' -- compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1' -+ } - - // We have too many methods including the appcompat library - compile 'com.android.support:multidex:1.0.1' -@@ -165,7 +159,7 @@ android { ++ compile 'com.github.est31:gerrit-rest-java-client:564e73a328a515f9a94338ec26' + // These are dependencies of the gerrit-rest-java-client library above + compile 'com.google.guava:guava:18.0' + compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1' +@@ -165,7 +160,7 @@ android { multiDexEnabled true } dexOptions { @@ -49,7 +45,7 @@ index 2967568..a7ca1c1 100644 } sourceSets { -@@ -195,28 +189,28 @@ android { +@@ -195,28 +190,28 @@ android { versionProps.load(new FileInputStream(versionPropsFile)) String full = versionProps['version'].toString() projectVersionName = full @@ -244,10 +240,10 @@ index e71823a..badbe9d 100644 } } diff --git a/build.gradle b/build.gradle -index 8d532a9..33b29df 100755 +index 8d532a9..faf82ed 100755 --- a/build.gradle +++ b/build.gradle -@@ -4,7 +4,7 @@ buildscript { +@@ -4,12 +4,13 @@ buildscript { jcenter() } dependencies { @@ -256,3 +252,11 @@ index 8d532a9..33b29df 100755 } } + allprojects { + repositories { + mavenCentral() ++ maven { url "https://jitpack.io" } + } +-} +\ No newline at end of file ++}