Skip to content

Commit e1bfc3b

Browse files
Removing Retrolambda and adding support for Native Java 8 compilation
1 parent d2cac6d commit e1bfc3b

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
/local.properties
44
/.idea/workspace.xml
55
/.idea/libraries
6+
/.idea/misc.xml
7+
/.idea/modules.xml
8+
/.idea/vcs.xml
69
.DS_Store
710
/build
811
/captures

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
maven {
7+
url "https://maven.google.com"
8+
}
69
}
710
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.0'
9-
classpath 'me.tatarka:gradle-retrolambda:3.4.0'
10-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
11+
classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
12+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1113

1214
// NOTE: Do not place your application dependencies here; they belong
1315
// in the individual module build.gradle files

example-client/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'me.tatarka.retrolambda'
32

43
android {
54
compileSdkVersion 25
@@ -32,8 +31,8 @@ dependencies {
3231
compile 'org.java-websocket:java-websocket:1.3.2'
3332
compile 'com.android.support:recyclerview-v7:25.2.0'
3433
compile 'io.reactivex:rxandroid:1.2.1'
35-
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
36-
compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
37-
compile 'com.squareup.retrofit2:retrofit:2.1.0'
34+
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
35+
compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
36+
compile 'com.squareup.retrofit2:retrofit:2.3.0'
3837
compile project(':lib')
3938
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Feb 23 17:37:13 EET 2017
1+
#Mon Jul 31 15:30:48 MST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip

lib/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'me.tatarka.retrolambda'
32
apply plugin: 'com.github.dcendents.android-maven'
43

54
group='com.github.NaikSoftware'
65

76
android {
87
compileSdkVersion 25
9-
buildToolsVersion "25.0.1"
8+
buildToolsVersion "25.0.2"
109

1110
defaultConfig {
1211
minSdkVersion 16
@@ -32,10 +31,10 @@ android {
3231
dependencies {
3332
compile fileTree(include: ['*.jar'], dir: 'libs')
3433
testCompile 'junit:junit:4.12'
35-
compile 'io.reactivex:rxjava:1.2.0'
34+
compile 'io.reactivex:rxjava:1.3.0'
3635
// Supported transports
3736
provided "org.java-websocket:java-websocket:1.3.2"
38-
provided 'com.squareup.okhttp3:okhttp:3.8.0'
37+
provided 'com.squareup.okhttp3:okhttp:3.8.1'
3938
}
4039

4140
task sourcesJar(type: Jar) {

0 commit comments

Comments
 (0)