X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=android%2Fbuild.gradle;h=b15a589ba5c401fde5c6f8adbfc97e950146e33c;hb=7217e9b86d6e44604703ffb9956bcade97cfe9c9;hp=935b5bf9109f4caee346bd7b416a92033ae06413;hpb=b1614a603547cfdcc3501b178f03aa40f1b7b82f;p=cavedroid.git diff --git a/android/build.gradle b/android/build.gradle index 935b5bf..b15a589 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "ru.deadsoftware.cavecraft" minSdkVersion 9 targetSdkVersion 20 - versionCode 1 - versionName "1.0" + versionCode 4 + versionName "alpha0.3-dev" } buildTypes { release { @@ -31,12 +31,10 @@ android { } } } - - // called every time gradle gets executed, takes the native dependencies of // the natives configuration, and extracts them to the proper libs/ folders // so they get packed with the APK. -task copyAndroidNatives() { +task copyAndroidNatives() { file("libs/armeabi/").mkdirs(); file("libs/armeabi-v7a/").mkdirs(); file("libs/arm64-v8a/").mkdirs(); @@ -45,12 +43,12 @@ task copyAndroidNatives() { configurations.natives.files.each { jar -> def outputDir = null - if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a") - if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") - if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi") - if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64") - if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86") - if(outputDir != null) { + if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a") + if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") + if (jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi") + if (jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64") + if (jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86") + if (outputDir != null) { copy { from zipTree(jar) into outputDir @@ -59,7 +57,6 @@ task copyAndroidNatives() { } } } - task run(type: Exec) { def path def localProperties = project.file("../local.properties") @@ -81,7 +78,6 @@ task run(type: Exec) { def adb = path + "/platform-tools/adb" commandLine "$adb", 'shell', 'am', 'start', '-n', 'ru.deadsoftware.cavecraft/ru.deadsoftware.cavecraft.AndroidLauncher' } - // sets up the Android Eclipse project, using the old Ant based build. eclipse { // need to specify Java source sets explicitly, SpringSource Gradle Eclipse plugin @@ -98,8 +94,8 @@ eclipse { } classpath { - plusConfigurations += [ project.configurations.compile ] - containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES' + plusConfigurations += [project.configurations.compile] + containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES' } project { @@ -112,12 +108,11 @@ eclipse { buildCommand "com.android.ide.eclipse.adt.ApkBuilder" } } - // sets up the Android Idea project, using the old Ant based build. idea { module { sourceDirs += file("src"); - scopes = [ COMPILE: [plus:[project.configurations.compile]]] + scopes = [COMPILE: [plus: [project.configurations.compile]]] iml { withXml { @@ -127,7 +122,7 @@ idea { builder.component(name: "FacetManager") { facet(type: "android", name: "Android") { configuration { - option(name: "UPDATE_PROPERTY_FILES", value:"true") + option(name: "UPDATE_PROPERTY_FILES", value: "true") } } } @@ -135,3 +130,5 @@ idea { } } } +dependencies { +}