From 639beb3f01af63986627a5e7365bd640ad9cf21d Mon Sep 17 00:00:00 2001 From: Nikita Karatun Date: Sat, 3 Mar 2018 13:56:01 +0300 Subject: [PATCH 1/2] gradle fix, idea files added to gitignore --- samples/.gitignore | 4 +++- samples/android/build.gradle | 11 ++++++----- samples/build.gradle | 2 +- .../com/cookbook/samples/FrustumCullingSample.java | 2 +- samples/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/samples/.gitignore b/samples/.gitignore index 425e927..b355a92 100644 --- a/samples/.gitignore +++ b/samples/.gitignore @@ -9,6 +9,8 @@ gen/ .project .settings/ .ipr -.iml + +.idea/ +*.iml /local.properties diff --git a/samples/android/build.gradle b/samples/android/build.gradle index 44e31cd..bb5f338 100644 --- a/samples/android/build.gradle +++ b/samples/android/build.gradle @@ -1,5 +1,5 @@ android { - buildToolsVersion "23.0.1" + buildToolsVersion '25.0.0' compileSdkVersion 20 sourceSets { main { @@ -10,6 +10,7 @@ android { renderscript.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] + jniLibs.srcDir 'libs' } instrumentTest.setRoot('tests') @@ -17,10 +18,10 @@ android { } // needed to add JNI shared libraries to APK when compiling on CLI -tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask -> - pkgTask.jniFolders = new HashSet() - pkgTask.jniFolders.add(new File(projectDir, 'libs')) -} +//tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask -> +// pkgTask.jniFolders = new HashSet() +// pkgTask.jniFolders.add(new File(projectDir, 'libs')) +//} // called every time gradle gets executed, takes the native dependencies of // the natives configuration, and extracts them to the proper libs/ folders diff --git a/samples/build.gradle b/samples/build.gradle index 4c0585d..3039f07 100644 --- a/samples/build.gradle +++ b/samples/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:2.3.2' classpath 'org.robovm:robovm-gradle-plugin:1.9.0' } } diff --git a/samples/core/src/com/cookbook/samples/FrustumCullingSample.java b/samples/core/src/com/cookbook/samples/FrustumCullingSample.java index f965090..9f45f5d 100644 --- a/samples/core/src/com/cookbook/samples/FrustumCullingSample.java +++ b/samples/core/src/com/cookbook/samples/FrustumCullingSample.java @@ -181,7 +181,7 @@ public void render() { shapeRenderer.end(); - // Show n� of currently rendered entities + // Show n of currently rendered entities batch2.begin(); stringBuilder.setLength(0); stringBuilder.append("Rendering: " ).append(renderCount).append("/").append(NUM_OF_ENTITIES); diff --git a/samples/gradle/wrapper/gradle-wrapper.properties b/samples/gradle/wrapper/gradle-wrapper.properties index 641676b..4631e91 100644 --- a/samples/gradle/wrapper/gradle-wrapper.properties +++ b/samples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Sep 21 13:08:26 CEST 2013 +#Sat Mar 03 13:48:51 MSK 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip From c3538bb266df4e6301e7b62bf23ab5711f59fb3c Mon Sep 17 00:00:00 2001 From: Nikita Karatun Date: Sat, 3 Mar 2018 14:09:45 +0300 Subject: [PATCH 2/2] number symbol --- samples/core/src/com/cookbook/samples/FrustumCullingSample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/core/src/com/cookbook/samples/FrustumCullingSample.java b/samples/core/src/com/cookbook/samples/FrustumCullingSample.java index 9f45f5d..827d226 100644 --- a/samples/core/src/com/cookbook/samples/FrustumCullingSample.java +++ b/samples/core/src/com/cookbook/samples/FrustumCullingSample.java @@ -181,7 +181,7 @@ public void render() { shapeRenderer.end(); - // Show n of currently rendered entities + // Show n° of currently rendered entities batch2.begin(); stringBuilder.setLength(0); stringBuilder.append("Rendering: " ).append(renderCount).append("/").append(NUM_OF_ENTITIES);