missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'mgerrit' into 'master'

Browse source 
mGerrit: fix crashing apk and re-enable it



See merge request !1141
This commit is contained in:
Boris Kraut 2016-01-13 21:49:07 +00:00
parent bacc9ba50b 11dd286dec
commit f9038700e1
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
metadata/com.jbirdvegas.mgerrit.txt
View file

@ -21,7 +21,6 @@ Repo Type:git
Repo:https://github.com/JBirdVegas/external_jbirdvegas_mGerrit.git Repo:https://github.com/JBirdVegas/external_jbirdvegas_mGerrit.git
Build:2.111.72,2111072 Build:2.111.72,2111072
disable=apk crashes
commit=2.111.72 commit=2.111.72
subdir=app subdir=app
patch=f-droid.2.111.72.diff patch=f-droid.2.111.72.diff

34
metadata/com.jbirdvegas.mgerrit/f-droid.2.111.72.diff
View file

@ -1,5 +1,5 @@
diff --git a/app/build.gradle b/app/build.gradle diff --git a/app/build.gradle b/app/build.gradle
index 2967568..a7ca1c1 100644 index 2967568..a26a43d 100644
--- a/app/build.gradle --- a/app/build.gradle
+++ b/app/build.gradle +++ b/app/build.gradle
@@ -4,7 +4,7 @@ buildscript { @@ -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:appcompat-v7:23.1.1'
compile 'com.android.support:design: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' compile 'de.hdodenhof:circleimageview:1.2.2'
-/* TODO: Enable this when the Android variant of the Gerrit Rest Java Client is officially released -/* TODO: Enable this when the Android variant of the Gerrit Rest Java Client is officially released
- The corresponding jar can then be removed - 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-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') - 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.github.est31:gerrit-rest-java-client:564e73a328a515f9a94338ec26'
- compile 'com.google.guava:guava:18.0' // These are dependencies of the gerrit-rest-java-client library above
- compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1' compile 'com.google.guava:guava:18.0'
+ } compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
@@ -165,7 +160,7 @@ android {
// We have too many methods including the appcompat library
compile 'com.android.support:multidex:1.0.1'
@@ -165,7 +159,7 @@ android {
multiDexEnabled true multiDexEnabled true
} }
dexOptions { dexOptions {
@ -49,7 +45,7 @@ index 2967568..a7ca1c1 100644
} }
sourceSets { sourceSets {
@@ -195,28 +189,28 @@ android { @@ -195,28 +190,28 @@ android {
versionProps.load(new FileInputStream(versionPropsFile)) versionProps.load(new FileInputStream(versionPropsFile))
String full = versionProps['version'].toString() String full = versionProps['version'].toString()
projectVersionName = full projectVersionName = full
@ -244,10 +240,10 @@ index e71823a..badbe9d 100644
} }
} }
diff --git a/build.gradle b/build.gradle diff --git a/build.gradle b/build.gradle
index 8d532a9..33b29df 100755 index 8d532a9..faf82ed 100755
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript { @@ -4,12 +4,13 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
@ -256,3 +252,11 @@ index 8d532a9..33b29df 100755
} }
} }
allprojects {
repositories {
mavenCentral()
+ maven { url "https://jitpack.io" }
}
-}
\ No newline at end of file
+}