diff --git a/build/android/Makefile b/build/android/Makefile index e46507e1..ee8e89f9 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -889,8 +889,6 @@ apk: local.properties $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(LEVELDB_LIB) $( export VERSION_STR="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" && \ export BUILD_TYPE_C=$$(echo "$${BUILD_TYPE}" | sed 's/./\U&/') && \ gradle assemble$$BUILD_TYPE_C && \ - echo " Success! =)"; \ - ant $$BUILD_TYPE && \ echo "APK stored at: build/outputs/apk/MultiCraft-$$BUILD_TYPE.apk" && \ echo "You can install it with \`make install_$$BUILD_TYPE\`" diff --git a/build/android/build.gradle b/build/android/build.gradle index f349d738..b8504540 100644 --- a/build/android/build.gradle +++ b/build/android/build.gradle @@ -1,13 +1,9 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:2.1.2' } } @@ -19,4 +15,40 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir +} + +apply plugin: 'com.android.application' + +android { + compileSdkVersion 24 + buildToolsVersion "24.0.3" + + defaultConfig { + applicationId "mobi.MultiCraft" + minSdkVersion 16 + targetSdkVersion 24 + } + Properties props = new Properties() + props.load(new FileInputStream(file("local.properties"))) + + if (props.getProperty("keystore") != null) { + signingConfigs { + release { + storeFile file(props["keystore"]) + storePassword props["keystore.password"] + keyAlias props["key"] + keyPassword props["key.password"] + } + } + + buildTypes { + release { + signingConfig signingConfigs.release + } + } + } +} + +dependencies { + compile 'com.android.support:support-v4:24.2.0' } \ No newline at end of file diff --git a/build/android/settings.gradle b/build/android/settings.gradle index 3fff080e..5eb5b931 100644 --- a/build/android/settings.gradle +++ b/build/android/settings.gradle @@ -1,2 +1 @@ rootProject.name = "MultiCraft" -