From 5e612a67ff2f57ed8754157b39c45d15e676b853 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 20 Oct 2017 13:48:55 +0200 Subject: [PATCH 1/2] extern: support-v4-preferencefragment: switch to jcenter() This fixes the android gradle plugin not being found. --- extern/support-v4-preferencefragment/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/support-v4-preferencefragment/build.gradle b/extern/support-v4-preferencefragment/build.gradle index e677e406f..dd3c0c58a 100644 --- a/extern/support-v4-preferencefragment/build.gradle +++ b/extern/support-v4-preferencefragment/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - mavenCentral() + jcenter() } dependencies { From b71173392dc298531718be53ce76754fb6e1bb57 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 20 Oct 2017 14:07:07 +0200 Subject: [PATCH 2/2] extern: always use java version 1.7 This is required because the fdroidclient app also explicitly sets java version to 1.7 and the modules need to be compiled for the same version. --- extern/nanohttpd/core/build.gradle | 3 +++ extern/zipsigner/build.gradle | 3 +++ 2 files changed, 6 insertions(+) diff --git a/extern/nanohttpd/core/build.gradle b/extern/nanohttpd/core/build.gradle index 65458666e..fa98bdbea 100644 --- a/extern/nanohttpd/core/build.gradle +++ b/extern/nanohttpd/core/build.gradle @@ -2,6 +2,9 @@ apply plugin: 'java' version = '2.1.0' +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + jar { baseName = 'nanohttpd' } diff --git a/extern/zipsigner/build.gradle b/extern/zipsigner/build.gradle index 434dfe7d6..39051b869 100644 --- a/extern/zipsigner/build.gradle +++ b/extern/zipsigner/build.gradle @@ -4,6 +4,9 @@ repositories { jcenter() } +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + dependencies { compile 'com.madgag.spongycastle:pkix:1.53.0.0' compile 'com.madgag.spongycastle:prov:1.53.0.0'