From 954a9cc46b2ed2da4169abf76f33fdd87d7cdb00 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 9 Dec 2014 11:56:19 +0000
Subject: [PATCH] Bumped gradle plugin to 1.0.0
---
app/build.gradle | 2 +-
build.gradle | 2 +-
client/build.gradle | 4 ++--
gradle/wrapper/gradle-wrapper.properties | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 70720595e..2f87f3aaa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
buildTypes {
release {
signingConfig signingConfigs.release
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
diff --git a/build.gradle b/build.gradle
index 68d0388c0..5262a560d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.13.3'
+ classpath 'com.android.tools.build:gradle:1.0.0'
classpath files('gradle/libs/gradle-witness.jar')
}
}
diff --git a/client/build.gradle b/client/build.gradle
index 82844defd..920810d80 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -11,7 +11,7 @@ android {
}
buildTypes {
release {
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
@@ -41,7 +41,7 @@ android.libraryVariants.all { variant ->
}
// Hook the copy task into the build
- variant.packageLibrary.dependsOn copyClientLibsTask
+ variant.processJavaResources.dependsOn copyClientLibsTask
copyClientLibsTask.mustRunAfter ':routerjars:buildClient'
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 27d8b1a65..0bffd23c3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
--
GitLab