Skip to content

Commit

Permalink
Update to Gradle 2.13 and Android SDK 23.0.3
Browse files Browse the repository at this point in the history
git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@47081 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
  • Loading branch information
kovzol committed May 5, 2016
1 parent 3d8f36c commit 99852a7
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 26 deletions.
12 changes: 0 additions & 12 deletions .settings/gradle.prefs

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -42,7 +42,7 @@ subprojects {

task wrapper(type: Wrapper) {
description = 'Creates the gradle wrapper'
gradleVersion = '2.3'
gradleVersion = '2.13'
}

// eclipse related tasks
Expand Down
6 changes: 3 additions & 3 deletions giac/build.gradle
Expand Up @@ -304,14 +304,14 @@ task testMinigiacExecutable (dependsOn: 'installMinigiacExecutable', type: Exec)

task androidCopyCrystaxSo (dependsOn: ':giac:giac-android:copyCrystaxSo')

task androidCopyEabiLibjavagiacSo (dependsOn: 'androideabiJavagiacSharedLibrary', type: Copy) {
task androidCopyEabiLibjavagiacSo (dependsOn: 'javagiacAndroideabiSharedLibrary', type: Copy) {
description 'Copies libjavagiac.so files to the src/android folder.'
from 'build/binaries/javagiacSharedLibrary/androideabi'
into 'giac-android/src/main/jniLibs/armeabi-v7a'
include ('libjavagiac.so')
}

task androidCopyX86LibjavagiacSo (dependsOn: 'androidx86JavagiacSharedLibrary', type: Copy) {
task androidCopyX86LibjavagiacSo (dependsOn: 'javagiacAndroidx86SharedLibrary', type: Copy) {
description 'Copies libjavagiac.so files to the src/android folder.'
from 'build/binaries/javagiacSharedLibrary/androidx86'
into 'giac-android/src/main/jniLibs/x86'
Expand All @@ -324,7 +324,7 @@ task androidAar (dependsOn: ['androidCopyCrystaxSo', 'androidCopyEabiLibjavagiac

task run (dependsOn: 'installMinigiacExecutable', type: Exec) {
description "Runs Giac's minigiac terminal"
commandLine 'build/install/minigiacExecutable/minigiac'
commandLine 'build/install/minigiac/minigiac'
standardInput = System.in
}

Expand Down
8 changes: 4 additions & 4 deletions giac/giac-android/build.gradle
Expand Up @@ -7,19 +7,19 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
classpath 'com.android.tools.build:gradle:2.1.0'
// classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
}
}

apply plugin: 'android-sdk-manager'
// apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.library'


android {
compileSdkVersion 23
buildToolsVersion "22.0.1"
buildToolsVersion "23.0.3"

defaultConfig {
minSdkVersion 8
Expand Down
12 changes: 6 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Mon Apr 27 13:26:00 CEST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
#Thu May 05 14:34:11 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

0 comments on commit 99852a7

Please sign in to comment.