Commit 44b0f810 authored by Matteo De Carlo's avatar Matteo De Carlo

update libraries

and minor assert fix
parent e91d923c
...@@ -26,8 +26,8 @@ android { ...@@ -26,8 +26,8 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:27.0.2' implementation 'com.android.support:appcompat-v7:27.1.1'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
} }
package org.covolunablu.marswallpaper.objects; package org.covolunablu.marswallpaper.objects;
import android.support.compat.BuildConfig;
import android.util.Log;
import org.covolunablu.androidtools.Tuple; import org.covolunablu.androidtools.Tuple;
import org.covolunablu.marswallpaper.BuildConfig;
import org.covolunablu.opengltools.Vertex3; import org.covolunablu.opengltools.Vertex3;
import java.util.HashMap; import java.util.HashMap;
...@@ -31,7 +29,7 @@ public class VertexList { ...@@ -31,7 +29,7 @@ public class VertexList {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
if (vertices.length % Vertex3.SIZE != 0) throw new AssertionError(); if (vertices.length % Vertex3.SIZE != 0) throw new AssertionError();
if (indexes.length % 3 == 0) throw new AssertionError(); if (indexes.length % 3 != 0) throw new AssertionError();
} }
for (int i = 0; i < vertices.length; i += 3) { for (int i = 0; i < vertices.length; i += 3) {
...@@ -241,10 +239,10 @@ public class VertexList { ...@@ -241,10 +239,10 @@ public class VertexList {
throw new RuntimeException("Clone should be supported here"); throw new RuntimeException("Clone should be supported here");
} }
int counter = 0; // possible values are 1 or 2 // int counter = 0; // possible values are 1 or 2
if (tABbig) counter++; // if (tABbig) counter++;
if (tACbig) counter++; // if (tACbig) counter++;
if (tBCbig) counter++; // if (tBCbig) counter++;
boolean increamentA = false; boolean increamentA = false;
boolean increamentB = false; boolean increamentB = false;
......
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.2.21' ext.kotlin_version = '1.2.30'
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.android.tools.build:gradle:3.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
......
#Mon Dec 25 17:46:33 CET 2017 #Wed May 16 16:12:46 CEST 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment