Merge branch 'fix_cachecleaner' of https://gitlab.com/Rancor/fdroiddata

This commit is contained in:
Daniel Martí 2015-01-05 14:45:15 +01:00
commit f76489b80e
2 changed files with 17 additions and 1 deletions

View file

@ -65,12 +65,12 @@ Build:2.1.1,17
sed -i -e '/classpath/iclasspath "com.android.tools.build:gradle:0.12.+"\n\/*\n' build.gradle sed -i -e '/classpath/iclasspath "com.android.tools.build:gradle:0.12.+"\n\/*\n' build.gradle
Build:2.1.2,18 Build:2.1.2,18
disable=java issues
commit=v2.1.2 commit=v2.1.2
subdir=CacheCleaner subdir=CacheCleaner
gradle=yes gradle=yes
prebuild=sed -i -e '/classpath/a*\/' build.gradle && \ prebuild=sed -i -e '/classpath/a*\/' build.gradle && \
sed -i -e '/classpath/iclasspath "com.android.tools.build:gradle:0.12.+"\n\/*\n' build.gradle sed -i -e '/classpath/iclasspath "com.android.tools.build:gradle:0.12.+"\n\/*\n' build.gradle
patch=cachecleaner-gradle.patch
Maintainer Notes: Maintainer Notes:
Prebuild is a quirk to force a specific gradle version. Upstream says "always use latest gradle". Prebuild is a quirk to force a specific gradle version. Upstream says "always use latest gradle".

View file

@ -0,0 +1,16 @@
diff --git a/CacheCleaner/build.gradle b/CacheCleaner/build.gradle
index e629920..a8ac4e4 100644
--- a/CacheCleaner/build.gradle
+++ b/CacheCleaner/build.gradle
@@ -15,6 +15,11 @@ repositories {
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_7
+ targetCompatibility JavaVersion.VERSION_1_7
+ }
}
dependencies {