Skip to content

Commit

Permalink
Some updates, still WiP.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kanawish
kanawish committed Aug 29, 2016
1 parent 642029a commit 0fd47ae
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 55 deletions.
28 changes: 2 additions & 26 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0-alpha7'
classpath 'com.android.tools.build:gradle:2.2.0-beta3'
classpath 'com.google.gms:google-services:3.0.0'

// Retrolambda Support
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'

// Better Dagger Support
// Annotation processing
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
}
Expand All @@ -31,27 +31,3 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}

ext {
// version numbers for dependencies // source for most recent release
supportLibraryVersion = '24.0.0' // See standalone SDK manager
guavaVersion = '19.0' // https://github.com/google/guava/releases

commonsIOVersion = '2.5' // https://commons.apache.org/proper/commons-io/
commonsLangVersion = '3.4' // https://commons.apache.org/proper/commons-lang/

daggerVersion = '2.5' // https://github.com/google/dagger/blob/master/CHANGELOG.md
okhttpVersion = '3.3.1' // https://github.com/square/okhttp/blob/master/CHANGELOG.md
retrofitVersion='2.1.0' // https://github.com/square/retrofit/blob/master/CHANGELOG.md
picassoVersion='2.5.2' // https://github.com/square/picasso/blob/master/CHANGELOG.md
picassoOkHttpDownloaderVersion = '1.0.2' // https://github.com/JakeWharton/picasso2-okhttp3-downloader/blob/master/CHANGELOG.md
butterKnifeVersion='8.1.0' // https://github.com/JakeWharton/butterknife/blob/master/CHANGELOG.md

autoValueVersion='1.2' // https://github.com/google/auto
autoValueGsonVersion='0.3.1' // https://github.com/rharter/auto-value-gson/blob/master/CHANGELOG.md

rxJavaVersion='1.1.6' // https://github.com/ReactiveX/RxJava/blob/1.x/CHANGES.md
rxAndroidVersion='1.2.1' // https://github.com/ReactiveX/RxAndroid/blob/master/CHANGES.md
rxBindingVersion='0.4.0' // https://github.com/JakeWharton/RxBinding/blob/master/CHANGELOG.md

}
35 changes: 17 additions & 18 deletions commonLib/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda'

android {
compileSdkVersion 24
buildToolsVersion "24.0.0 rc4"
buildToolsVersion "24.0.2"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand All @@ -27,27 +27,26 @@ 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.1.2'
compile "com.jakewharton.timber:timber:4.3.0" // https://github.com/JakeWharton/timber/blob/master/CHANGELOG.md

// RxJava
compile "io.reactivex:rxjava:$project.rxJavaVersion"
// Android Extensions - https://github.com/ReactiveX/RxAndroid/wiki
compile "io.reactivex:rxandroid:$project.rxAndroidVersion"
compile "io.reactivex:rxjava:1.1.9" // https://github.com/ReactiveX/RxJava/blob/1.x/CHANGES.md
compile "io.reactivex:rxandroid:1.2.1" // https://github.com/ReactiveX/RxAndroid/blob/1.x/CHANGES.md
compile "com.jakewharton.rxrelay:rxrelay:1.1.0" // https://github.com/JakeWharton/RxRelay/blob/master/CHANGELOG.md
compile "com.jakewharton.rxbinding:rxbinding:$project.rxBindingVersion"
compile "com.jakewharton.rxbinding:rxbinding-support-v4:$project.rxBindingVersion"
compile "com.jakewharton.rxbinding:rxbinding-appcompat-v7:$project.rxBindingVersion"
compile 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
compile 'com.jakewharton.rxbinding:rxbinding-recyclerview-v7:0.4.0'
compile "com.jakewharton.rxbinding:rxbinding:0.4.0" // https://github.com/JakeWharton/RxBinding/blob/master/CHANGELOG.md
compile "com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0"
compile "com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0"
compile "com.jakewharton.rxbinding:rxbinding-design:0.4.0"
compile "com.jakewharton.rxbinding:rxbinding-recyclerview-v7:0.4.0"

// Square Networking
compile "com.squareup.okhttp3:okhttp:$project.okhttpVersion"
compile "com.squareup.okhttp3:logging-interceptor:$project.okhttpVersion"
compile "com.squareup.okhttp3:okhttp-urlconnection:$project.okhttpVersion"
compile "com.squareup.picasso:picasso:$project.picassoVersion"
compile "com.jakewharton.picasso:picasso2-okhttp3-downloader:$project.picassoOkHttpDownloaderVersion"
compile "com.squareup.retrofit2:retrofit:$project.retrofitVersion"
compile "com.squareup.retrofit2:adapter-rxjava:$project.retrofitVersion"
compile "com.squareup.retrofit2:converter-gson:$project.retrofitVersion"
compile "com.squareup.okhttp3:okhttp:3.4.1" // https://github.com/square/okhttp/blob/master/CHANGELOG.md
compile "com.squareup.okhttp3:logging-interceptor:3.4.1"
compile "com.squareup.okhttp3:okhttp-urlconnection:3.4.1"
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.0.2" // https://github.com/JakeWharton/picasso2-okhttp3-downloader/blob/master/CHANGELOG.md
compile "com.squareup.retrofit2:retrofit:2.1.0" // https://github.com/square/retrofit/blob/master/CHANGELOG.md
compile "com.squareup.retrofit2:adapter-rxjava:2.1.0"
compile "com.squareup.retrofit2:converter-gson:2.1.0"

}
3 changes: 1 addition & 2 deletions rajaDemo/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
apply plugin: 'me.tatarka.retrolambda'

android {
compileSdkVersion 24
buildToolsVersion "24.0.0 rc4"
buildToolsVersion "24.0.2"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand Down
13 changes: 13 additions & 0 deletions rajaDemo/src/main/java/com/kanawish/raja/SimpleRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@
import android.graphics.Color;
import android.support.annotation.Nullable;

import com.kanawish.raja.rajademo.R;

import org.rajawali3d.ATransformable3D;
import org.rajawali3d.animation.Animation;
import org.rajawali3d.animation.EllipticalOrbitAnimation3D;
import org.rajawali3d.animation.RotateOnAxisAnimation;
import org.rajawali3d.lights.DirectionalLight;
import org.rajawali3d.materials.Material;
import org.rajawali3d.materials.methods.DiffuseMethod;
import org.rajawali3d.materials.textures.ATexture;
import org.rajawali3d.math.vector.Vector3;
import org.rajawali3d.postprocessing.PostProcessingManager;
import org.rajawali3d.primitives.Cube;
Expand All @@ -28,6 +31,16 @@ protected void initScene() {
try {
getCurrentScene().setBackgroundColor(Color.BLUE);

getCurrentCamera().setFarPlane(1000);

// Skybox images by Emil Persson, aka Humus. http://www.humus.name humus@comhem.se
try {
getCurrentScene().setSkybox(R.drawable.posx, R.drawable.negx,
R.drawable.posy, R.drawable.negy, R.drawable.posz, R.drawable.negz);
} catch (ATexture.TextureException e) {
e.printStackTrace();
}

// Lights,
DirectionalLight key = new DirectionalLight(0,0.1,0.2);
key.setPosition(0.0,10.0,2.5);
Expand Down
2 changes: 1 addition & 1 deletion rajaTangoLib/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda'

android {
compileSdkVersion 24
buildToolsVersion "24.0.0 rc4"
buildToolsVersion "24.0.2"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand Down
3 changes: 1 addition & 2 deletions rajaVrDemo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ apply plugin: 'me.tatarka.retrolambda'

android {
compileSdkVersion 24
buildToolsVersion "24.0.0 rc4"
buildToolsVersion "24.0.2"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

defaultConfig {
applicationId "com.kanawish.raja.vr"
minSdkVersion 19
Expand Down
12 changes: 6 additions & 6 deletions tangoRoomEditor/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'me.tatarka.retrolambda'

android {
compileSdkVersion 24
buildToolsVersion "24.0.0 rc4"
buildToolsVersion "24.0.2"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand Down Expand Up @@ -49,11 +49,11 @@ dependencies {

compile project(':rajaTangoLib')

compile 'com.android.support:appcompat-v7:24.0.0'
compile 'com.android.support:appcompat-v7:24.2.0'

// APT/Plugin based goodness
apt "com.jakewharton:butterknife-compiler:$project.butterKnifeVersion"
compile "com.jakewharton:butterknife:$project.butterKnifeVersion"
apt "com.google.auto.value:auto-value:$project.autoValueVersion"
apt "com.ryanharter.auto.value:auto-value-gson:$project.autoValueGsonVersion"
apt "com.jakewharton:butterknife-compiler:8.4.0" // https://github.com/JakeWharton/butterknife/blob/master/CHANGELOG.md
compile "com.jakewharton:butterknife:8.4.0"
apt "com.google.auto.value:auto-value:1.2" // https://github.com/google/auto
apt "com.ryanharter.auto.value:auto-value-gson:0.4.2" // https://github.com/rharter/auto-value-gson/blob/master/CHANGELOG.md
}

0 comments on commit 0fd47ae

Please sign in to comment.