diff --git a/app/build.gradle b/app/build.gradle index 0fe2ee07..e9eed6df 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,9 +5,9 @@ android { buildToolsVersion '30.0.2' ndkVersion '21.3.6528147' defaultConfig { - applicationId "org.love2d.android" + applicationId 'org.love2d.android' versionCode 29 - versionName "11.3a" + versionName '11.3a' minSdkVersion 14 targetSdkVersion 30 } @@ -27,7 +27,7 @@ android { } embed { dimension 'mode' - applicationIdSuffix "embed" + applicationIdSuffix '.embed' } } lintOptions { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 05581714..df2aff3b 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -16,8 +16,4 @@ # public *; #} --keep class br.com.tapps.love.LoveActivity { *; } - --keepclassmembers class br.com.tapps.love.LoveActivity { - public com.naef.jnlua.LuaState createLuaState(); -} \ No newline at end of file +-keep class org.love2d.android.GameActivity { *; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cf3efa72..c62ccf91 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ - + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 12d38de6..1a34b28c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +#Thu Oct 01 16:43:18 SGT 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip diff --git a/love/build.gradle b/love/build.gradle index fc405dc2..c7643276 100644 --- a/love/build.gradle +++ b/love/build.gradle @@ -14,7 +14,7 @@ android { compileSdkVersion 30 buildToolsVersion "30.0.2" minSdkVersion 14 - resValue "bool", "embed", "false" + resValue 'bool', 'embed', 'false' externalNativeBuild { ndkBuild { arguments "-j4" @@ -43,7 +43,7 @@ android { } embed { dimension 'mode' - resValue "bool", "embed", "true" + resValue 'bool', 'embed', 'true' } } sourceSets { @@ -61,7 +61,7 @@ android { } externalNativeBuild { ndkBuild { - path "src/jni/Android.mk" + path 'src/jni/Android.mk' } } lintOptions { diff --git a/love/src/main/java/org/love2d/android/GameActivity.java b/love/src/main/java/org/love2d/android/GameActivity.java index edda34a9..ab8b7579 100644 --- a/love/src/main/java/org/love2d/android/GameActivity.java +++ b/love/src/main/java/org/love2d/android/GameActivity.java @@ -229,17 +229,13 @@ public class GameActivity extends SDLActivity { } protected void checkLovegameFolder() { - // If no game.love was found fall back to the game in /lovegame - // if using normal or playstore build + // If no game.love was found and embed flavor is not used, fall back to the game in + // /Android/data//games/lovegame if (!embed) { Log.d("GameActivity", "fallback to lovegame folder"); - if (hasExternalStoragePermission()) { - File ext = Environment.getExternalStorageDirectory(); - if ((new File(ext, "/lovegame/main.lua")).exists()) { - gamePath = ext.getPath() + "/lovegame/"; - } - } else { - Log.d("GameActivity", "Cannot load game from /sdcard/lovegame: permission not granted"); + File ext = getExternalFilesDir("games"); + if ((new File(ext, "/lovegame/main.lua")).exists()) { + gamePath = ext.getPath() + "/lovegame/"; } } } @@ -295,7 +291,6 @@ public class GameActivity extends SDLActivity { } else { Log.d("GameActivity", "cannot open game " + gamePath + ": no external storage permission given!"); } - } else { self.checkLovegameFolder(); if (gamePath.length() > 0)