Skip to content

1.4.0 gradle fix #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

1.4.0 gradle fix #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
639beb3
gradle fix, idea files added to gitignore
nikita-karatun Mar 3, 2018
c3538bb
number symbol
nikita-karatun Mar 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion samples/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ gen/
.project
.settings/
.ipr
.iml

.idea/
*.iml

/local.properties
11 changes: 6 additions & 5 deletions samples/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
android {
buildToolsVersion "23.0.1"
buildToolsVersion '25.0.0'
compileSdkVersion 20
sourceSets {
main {
Expand All @@ -10,17 +10,18 @@ android {
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
jniLibs.srcDir 'libs'
}

instrumentTest.setRoot('tests')
}
}

// 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<File>()
pkgTask.jniFolders.add(new File(projectDir, 'libs'))
}
//tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask ->
// pkgTask.jniFolders = new HashSet<File>()
// 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
Expand Down
2 changes: 1 addition & 1 deletion samples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
2 changes: 1 addition & 1 deletion samples/core/src/com/cookbook/samples/FrustumCullingSample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions samples/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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