summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--android/AndroidManifest.xml8
-rw-r--r--core/src/ch/asynk/rustanddust/RustAndDust.java2
-rwxr-xr-xrun4
4 files changed, 10 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index a451253..7bf7f41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,9 @@ www-test/
## Android Studio and Intellij and Android in general
android/libs/armeabi/
android/libs/armeabi-v7a/
+android/libs/arm64-v8a/
android/libs/x86/
+android/libs/x86_64/
android/gen/
android/**/*.sqlite
.idea/
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index ae7aeca..a7fd7cd 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ch.asynk.rustanddust.android"
- android:versionCode="31"
+ android:versionCode="35"
android:versionName="1.0.1" >
- <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="20" />
- <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
- <uses-permission android:name="android.permission.READ_CONTACTS" />
+ <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="28" />
+ <!-- <uses-permission android:name="android.permission.GET_ACCOUNTS"/> -->
+ <!-- <uses-permission android:name="android.permission.READ_CONTACTS" /> -->
<application
android:allowBackup="true"
diff --git a/core/src/ch/asynk/rustanddust/RustAndDust.java b/core/src/ch/asynk/rustanddust/RustAndDust.java
index 786f61c..051942c 100644
--- a/core/src/ch/asynk/rustanddust/RustAndDust.java
+++ b/core/src/ch/asynk/rustanddust/RustAndDust.java
@@ -23,7 +23,7 @@ import ch.asynk.rustanddust.ui.Bg;
public class RustAndDust extends Game
{
- public static final String VERSION = "v31";
+ public static final String VERSION = "v35";
public static final String BG_PATCH = "bg";
public static final String FRAME_PATCH = "frame";
diff --git a/run b/run
index 7233a49..78fcc71 100755
--- a/run
+++ b/run
@@ -5,10 +5,12 @@ ARGS="desktop:run"
ALIAS=jeyzu
KEYSTORE="/home/jeyzu/etc/sync/jeyzu-key.keystore"
APK="./android/build/apk/android-release-unsigned.apk"
-ZIPALIGN="/opt/android-sdk/build-tools/23.0.3/zipalign"
+ZIPALIGN="/opt/android-sdk/build-tools/28.0.3/zipalign"
APK_OUT="./RustAndDust-signed-aligned.apk"
DB_FILES="./android/assets/data/*.sqlite"
+export ANDROID_HOME=/opt/android-sdk
+
function gradlew_do()
{
echo "./gradlew $ARGS" && ./gradlew $ARGS || exit 1