Updated gradle

jacek-marchwicki · jacek-marchwicki · commit 3ee19f16980c · 2016-04-18T14:05:16.000+02:00
Change-Id: Id17d37a3aae49ca26ebbf870e77027e567950357
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
diff --git a/websockets-rxjava-example/build.gradle b/websockets-rxjava-example/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.0-beta1'
     }
 }
 
@@ -45,4 +45,9 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
diff --git a/websockets-rxjava/build.gradle b/websockets-rxjava/build.gradle
@@ -3,14 +3,17 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.0-beta1'
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'signing'
 
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 repositories {
     mavenCentral()
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ buildscript {`
`3`	`3`	`mavenCentral()`
`4`	`4`	`}`
`5`	`5`	`dependencies {`
`6`		`- classpath 'com.android.tools.build:gradle:1.1.0'`
	`6`	`+ classpath 'com.android.tools.build:gradle:2.1.0-beta1'`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`@@ -45,4 +45,9 @@ android {`
`45`	`45`	`lintOptions {`
`46`	`46`	`disable 'InvalidPackage'`
`47`	`47`	`}`
	`48`	`+`
	`49`	`+ compileOptions {`
	`50`	`+ sourceCompatibility JavaVersion.VERSION_1_7`
	`51`	`+ targetCompatibility JavaVersion.VERSION_1_7`
	`52`	`+ }`
`48`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,17 @@ buildscript {`
`3`	`3`	`mavenCentral()`
`4`	`4`	`}`
`5`	`5`	`dependencies {`
`6`		`- classpath 'com.android.tools.build:gradle:1.1.0'`
	`6`	`+ classpath 'com.android.tools.build:gradle:2.1.0-beta1'`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`apply plugin: 'java'`
`11`	`11`	`apply plugin: 'maven'`
`12`	`12`	`apply plugin: 'signing'`
`13`	`13`
	`14`	`+sourceCompatibility = 1.7`
	`15`	`+targetCompatibility = 1.7`
	`16`	`+`
`14`	`17`	`repositories {`
`15`	`18`	`mavenCentral()`
`16`	`19`	`}`