From d8f8e73326b5a21f5917841e1a6cc446d80359b0 Mon Sep 17 00:00:00 2001 From: Etienne Caron Date: Wed, 29 Mar 2017 08:13:58 -0400 Subject: [PATCH] Cleanup/upgrade pass in Gradle dependencies. --- build.gradle | 11 ++++---- commonLib/build.gradle | 22 ++++++++-------- .../main/assets/shaders/_300.default.v4.fs | 2 +- glEpisodes/build.gradle | 21 ++++++++++++--- gldemo/build.gradle | 20 +++++++++----- rajaDemo/build.gradle | 26 ++++++++++++++----- rajaVrDemo/build.gradle | 21 ++++++++++++--- 7 files changed, 84 insertions(+), 39 deletions(-) diff --git a/build.gradle b/build.gradle index ac5f8ab..e40cc5a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,25 +2,24 @@ buildscript { repositories { - mavenLocal() +// mavenLocal() jcenter() mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:2.2.3' - classpath 'com.google.gms:google-services:3.0.0' - - // Retrolambda Support - classpath 'me.tatarka:gradle-retrolambda:3.3.0' + classpath 'me.tatarka:gradle-retrolambda:3.5.0' + classpath 'com.google.gms:google-services:3.0.0' } } allprojects { repositories { - mavenLocal() +// mavenLocal() maven { url "http://google.bintray.com/googlevr" } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { url "https://jitpack.io" } jcenter() mavenCentral() } diff --git a/commonLib/build.gradle b/commonLib/build.gradle index c5532ee..a9e1b1c 100644 --- a/commonLib/build.gradle +++ b/commonLib/build.gradle @@ -22,7 +22,7 @@ android { } } -final SUPPORT_LIB_VERSION = '25.1.0' // https://developer.android.com/topic/libraries/support-library/revisions.html +final SUPPORT_LIB_VERSION = '25.1.1' // https://developer.android.com/topic/libraries/support-library/revisions.html final PLAY_SERVICES_VERSION = '10.0.1' // https://developers.google.com/android/guides/releases final FIREBASE_VERSION = '10.0.1' // https://firebase.google.com/support/release-notes/android @@ -38,7 +38,7 @@ dependencies { // Timber Logging API: Better method signatures, easy log-level-by-flavor management, decent lint checks, etc. // https://github.com/JakeWharton/timber - compile "com.jakewharton.timber:timber:4.4.0" // https://github.com/JakeWharton/timber/blob/master/CHANGELOG.md + compile "com.jakewharton.timber:timber:4.5.1" // https://github.com/JakeWharton/timber/blob/master/CHANGELOG.md // UI compile 'com.dmitrymalkovich.android:material-design-dimens:1.4' // https://github.com/DmitryMalkovich/material-design-dimens @@ -46,18 +46,18 @@ dependencies { // Data Manip compile "com.squareup.moshi:moshi:1.3.1" // https://github.com/square/moshi/blob/master/CHANGELOG.md - // RxJava 2 - compile "io.reactivex.rxjava2:rxjava:2.0.5" // https://github.com/ReactiveX/RxJava/blob/2.x/CHANGES.md + // RxJava 2 for your declarative programming needs + compile "io.reactivex.rxjava2:rxjava:2.0.6" // https://github.com/ReactiveX/RxJava/blob/2.x/CHANGES.md compile "io.reactivex.rxjava2:rxandroid:2.0.1" // https://github.com/ReactiveX/RxAndroid/blob/2.x/CHANGES.md - compile "com.github.akarnokd:rxjava2-extensions:0.15.0" // https://github.com/akarnokd/RxJava2Extensions + compile "com.github.pakoito:FunctionalRx2:1.1.0" // https://github.com/pakoito/FunctionalRx2 // Square Networking - compile "com.squareup.okhttp3:okhttp:3.5.0" // https://github.com/square/okhttp/blob/master/CHANGELOG.md - compile "com.squareup.okhttp3:okhttp-urlconnection:3.5.0" - debugCompile "com.squareup.okhttp3:logging-interceptor:3.5.0" - compile "com.squareup.retrofit2:retrofit:2.1.0" // https://github.com/square/retrofit/blob/master/CHANGELOG.md - compile "com.squareup.retrofit2:converter-gson:2.1.0" - compile "com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0" // https://github.com/JakeWharton/retrofit2-rxjava2-adapter/blob/master/CHANGELOG.md + compile "com.squareup.okhttp3:okhttp:3.6.0" // https://github.com/square/okhttp/blob/master/CHANGELOG.md + compile "com.squareup.okhttp3:okhttp-urlconnection:3.6.0" + debugCompile "com.squareup.okhttp3:logging-interceptor:3.6.0" + compile "com.squareup.retrofit2:retrofit:2.2.0" // https://github.com/square/retrofit/blob/master/CHANGELOG.md + compile "com.squareup.retrofit2:converter-gson:2.2.0" + compile "com.squareup.retrofit2:adapter-rxjava2:2.2.0" compile "com.squareup.picasso:picasso:2.5.2" // https://github.com/square/picasso/blob/master/CHANGELOG.md compile "com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0" // https://github.com/JakeWharton/picasso2-okhttp3-downloader/blob/master/CHANGELOG.md diff --git a/glDemo/src/main/assets/shaders/_300.default.v4.fs b/glDemo/src/main/assets/shaders/_300.default.v4.fs index 0d79722..e01200b 100644 --- a/glDemo/src/main/assets/shaders/_300.default.v4.fs +++ b/glDemo/src/main/assets/shaders/_300.default.v4.fs @@ -101,7 +101,7 @@ void main() { } else out_color = vColor; - + // out_color += vec4(vPosition.x,vPosition.y,0.0,0.0); //out_color = vColor ; // - (rand(gl_FragCoord.xy/uResolution) * 0.10); // gl_FragColor.a = 1.0; diff --git a/glEpisodes/build.gradle b/glEpisodes/build.gradle index d0a3089..1a51b20 100644 --- a/glEpisodes/build.gradle +++ b/glEpisodes/build.gradle @@ -34,10 +34,23 @@ dependencies { compile 'com.google.vr:sdk-base:1.10.0' compile 'com.google.vr:sdk-common:1.10.0' - // DI stack - annotationProcessor "com.github.stephanenicolas.toothpick:toothpick-compiler:1.0.3" // https://github.com/stephanenicolas/toothpick/blob/master/CHANGELOG.md - compile "com.github.stephanenicolas.toothpick:toothpick-runtime:1.0.3" - compile "com.github.stephanenicolas.toothpick:smoothie:1.0.3" + // DI Stack + annotationProcessor "com.github.stephanenicolas.toothpick:toothpick-compiler:1.0.5" // https://github.com/stephanenicolas/toothpick/blob/master/CHANGELOG.md + compile "com.github.stephanenicolas.toothpick:toothpick-runtime:1.0.5" + compile "com.github.stephanenicolas.toothpick:smoothie:1.0.5" + + // APT/Plugin based boilerplate removal + compile "com.jakewharton:butterknife:8.5.1" // https://github.com/JakeWharton/butterknife/blob/master/CHANGELOG.md + annotationProcessor "com.jakewharton:butterknife-compiler:8.5.1" + + annotationProcessor "com.google.auto.value:auto-value:1.3" // https://github.com/google/auto + annotationProcessor "com.ryanharter.auto.value:auto-value-gson:0.4.6" // https://github.com/rharter/auto-value-gson/blob/master/CHANGELOG.md + annotationProcessor "me.mattlogan.auto.value:auto-value-firebase:1.0.1" // https://github.com/mattlogan/auto-value-firebase/blob/master/CHANGELOG.md + annotationProcessor "com.gabrielittner.auto.value:auto-value-with:1.0.0" // https://github.com/gabrielittner/auto-value-with/blob/master/CHANGELOG.md + provided "com.google.auto.value:auto-value:1.3" + provided "com.ryanharter.auto.value:auto-value-gson:0.4.6" + provided "me.mattlogan.auto.value:auto-value-firebase-annotation:1.0.1" + compile "me.mattlogan.auto.value:auto-value-firebase-adapter:1.0.1" } diff --git a/gldemo/build.gradle b/gldemo/build.gradle index d43a7df..0ce48fd 100644 --- a/gldemo/build.gradle +++ b/gldemo/build.gradle @@ -38,17 +38,25 @@ dependencies { compile 'com.google.vr:sdk-base:1.10.0' compile 'com.google.vr:sdk-common:1.10.0' + // DI stack annotationProcessor "com.github.stephanenicolas.toothpick:toothpick-compiler:1.0.3" // https://github.com/stephanenicolas/toothpick/blob/master/CHANGELOG.md compile "com.github.stephanenicolas.toothpick:toothpick-runtime:1.0.3" compile "com.github.stephanenicolas.toothpick:smoothie:1.0.3" - // Boilerplate removers - compile "com.jakewharton:butterknife:8.4.0" // https://github.com/JakeWharton/butterknife/blob/master/CHANGELOG.md - annotationProcessor "com.jakewharton:butterknife-compiler:8.4.0" - provided "com.google.auto.value:auto-value:1.2" // https://github.com/google/auto - annotationProcessor "com.google.auto.value:auto-value:1.2" - annotationProcessor "com.ryanharter.auto.value:auto-value-gson:0.4.2" // https://github.com/rharter/auto-value-gson/blob/master/CHANGELOG.md + // APT/Plugin based boilerplate removal + compile "com.jakewharton:butterknife:8.5.1" // https://github.com/JakeWharton/butterknife/blob/master/CHANGELOG.md + annotationProcessor "com.jakewharton:butterknife-compiler:8.5.1" + + annotationProcessor "com.google.auto.value:auto-value:1.3" // https://github.com/google/auto + annotationProcessor "com.ryanharter.auto.value:auto-value-gson:0.4.6" // https://github.com/rharter/auto-value-gson/blob/master/CHANGELOG.md + annotationProcessor "me.mattlogan.auto.value:auto-value-firebase:1.0.1" // https://github.com/mattlogan/auto-value-firebase/blob/master/CHANGELOG.md + annotationProcessor "com.gabrielittner.auto.value:auto-value-with:1.0.0" // https://github.com/gabrielittner/auto-value-with/blob/master/CHANGELOG.md + provided "com.google.auto.value:auto-value:1.3" + provided "com.ryanharter.auto.value:auto-value-gson:0.4.6" + provided "me.mattlogan.auto.value:auto-value-firebase-annotation:1.0.1" + compile "me.mattlogan.auto.value:auto-value-firebase-adapter:1.0.1" + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' diff --git a/rajaDemo/build.gradle b/rajaDemo/build.gradle index 16b28f2..6d7c8f1 100644 --- a/rajaDemo/build.gradle +++ b/rajaDemo/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'com.android.application' apply plugin: 'me.tatarka.retrolambda' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 25 + buildToolsVersion "25.0.2" compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -11,7 +11,7 @@ android { defaultConfig { applicationId "com.kanawish.sample.raja" minSdkVersion 19 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 1 versionName "1.0" } @@ -35,11 +35,23 @@ android { dependencies { compile project(':commonLib') - annotationProcessor "com.github.stephanenicolas.toothpick:toothpick-compiler:1.0.3" // https://github.com/stephanenicolas/toothpick/blob/master/CHANGELOG.md - compile "com.github.stephanenicolas.toothpick:toothpick-runtime:1.0.3" - compile "com.github.stephanenicolas.toothpick:smoothie:1.0.3" + // DI Stack + annotationProcessor "com.github.stephanenicolas.toothpick:toothpick-compiler:1.0.5" // https://github.com/stephanenicolas/toothpick/blob/master/CHANGELOG.md + compile "com.github.stephanenicolas.toothpick:toothpick-runtime:1.0.5" + compile "com.github.stephanenicolas.toothpick:smoothie:1.0.5" -// compile 'org.rajawali3d:rajawali:1.0.325@aar' + // APT/Plugin based boilerplate removal + compile "com.jakewharton:butterknife:8.5.1" // https://github.com/JakeWharton/butterknife/blob/master/CHANGELOG.md + annotationProcessor "com.jakewharton:butterknife-compiler:8.5.1" + + annotationProcessor "com.google.auto.value:auto-value:1.3" // https://github.com/google/auto + annotationProcessor "com.ryanharter.auto.value:auto-value-gson:0.4.6" // https://github.com/rharter/auto-value-gson/blob/master/CHANGELOG.md + annotationProcessor "me.mattlogan.auto.value:auto-value-firebase:1.0.1" // https://github.com/mattlogan/auto-value-firebase/blob/master/CHANGELOG.md + annotationProcessor "com.gabrielittner.auto.value:auto-value-with:1.0.0" // https://github.com/gabrielittner/auto-value-with/blob/master/CHANGELOG.md + provided "com.google.auto.value:auto-value:1.3" + provided "com.ryanharter.auto.value:auto-value-gson:0.4.6" + provided "me.mattlogan.auto.value:auto-value-firebase-annotation:1.0.1" + compile "me.mattlogan.auto.value:auto-value-firebase-adapter:1.0.1" // Latest version of Rajawali // see https://github.com/Rajawali/Rajawali diff --git a/rajaVrDemo/build.gradle b/rajaVrDemo/build.gradle index 8d88352..0b2207a 100644 --- a/rajaVrDemo/build.gradle +++ b/rajaVrDemo/build.gradle @@ -37,10 +37,23 @@ dependencies { compile project(':commonLib') - // APT/Plugin based goodness - annotationProcessor "com.github.stephanenicolas.toothpick:toothpick-compiler:1.0.3" // https://github.com/stephanenicolas/toothpick/blob/master/CHANGELOG.md - compile "com.github.stephanenicolas.toothpick:toothpick-runtime:1.0.3" - compile "com.github.stephanenicolas.toothpick:smoothie:1.0.3" + // DI Stack + annotationProcessor "com.github.stephanenicolas.toothpick:toothpick-compiler:1.0.5" // https://github.com/stephanenicolas/toothpick/blob/master/CHANGELOG.md + compile "com.github.stephanenicolas.toothpick:toothpick-runtime:1.0.5" + compile "com.github.stephanenicolas.toothpick:smoothie:1.0.5" + + // APT/Plugin based boilerplate removal + compile "com.jakewharton:butterknife:8.5.1" // https://github.com/JakeWharton/butterknife/blob/master/CHANGELOG.md + annotationProcessor "com.jakewharton:butterknife-compiler:8.5.1" + + annotationProcessor "com.google.auto.value:auto-value:1.3" // https://github.com/google/auto + annotationProcessor "com.ryanharter.auto.value:auto-value-gson:0.4.6" // https://github.com/rharter/auto-value-gson/blob/master/CHANGELOG.md + annotationProcessor "me.mattlogan.auto.value:auto-value-firebase:1.0.1" // https://github.com/mattlogan/auto-value-firebase/blob/master/CHANGELOG.md + annotationProcessor "com.gabrielittner.auto.value:auto-value-with:1.0.0" // https://github.com/gabrielittner/auto-value-with/blob/master/CHANGELOG.md + provided "com.google.auto.value:auto-value:1.3" + provided "com.ryanharter.auto.value:auto-value-gson:0.4.6" + provided "me.mattlogan.auto.value:auto-value-firebase-annotation:1.0.1" + compile "me.mattlogan.auto.value:auto-value-firebase-adapter:1.0.1" // SNAPSHOT versions of Rajawali can be used in some cases // see https://github.com/Rajawali/Rajawali