LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.5b: SPD-classes and core are no longer android-specific modules!

Browse Source
This commit is contained in:
Evan Debenham 2019-10-10 22:28:37 -04:00
parent b985ed3bf5
commit 2aaf18b0b8
6 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SPD-classes/build.gradle
View File

@ -1,22 +1,12 @@
//FIXME currently an android library while small amounts of android-specific code remain apply plugin: 'java-library'
apply plugin: 'com.android.library'
android { [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
compileSdkVersion appAndroidCompileSDK
defaultConfig {
//noinspection MinSdkTooLow
minSdkVersion appAndroidMinSDK
}
}
configurations { natives }
dependencies { dependencies {
//TODO migrate this to implementation from api //TODO migrate this to implementation from api
//in order to do this I have to remove 100% of libGDX API access from core //in order to do this I have to remove 100% of libGDX API access from core
api "com.badlogicgames.gdx:gdx:$gdxVersion" api "com.badlogicgames.gdx:gdx:$gdxVersion"
api "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-controllers:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
implementation "org.json:json:20190722"
} }

8
SPD-classes/src/main/AndroidManifest.xml
View File

@ -1,8 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.watabou">
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-feature android:glEsVersion="0x00020000"/>
</manifest>

4
SPD-classes/src/main/java/com/watabou/utils/DeviceCompat.java
View File

@ -22,7 +22,7 @@
package com.watabou.utils; package com.watabou.utils;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.watabou.BuildConfig; import com.watabou.noosa.Game;
//TODO migrate to platformSupport class //TODO migrate to platformSupport class
public class DeviceCompat { public class DeviceCompat {
@ -50,7 +50,7 @@ public class DeviceCompat {
} }
public static boolean isDebug(){ public static boolean isDebug(){
return BuildConfig.DEBUG; return Game.version.contains("INDEV");
} }
public static void openURI( String URI ){ public static void openURI( String URI ){

5
android/src/main/AndroidManifest.xml
View File

@ -3,8 +3,9 @@
package="com.shatteredpixel.shatteredpixeldungeon.android" package="com.shatteredpixel.shatteredpixeldungeon.android"
android:installLocation="auto"> android:installLocation="auto">
<uses-feature <uses-feature android:glEsVersion="0x00020000"/>
android:glEsVersion="0x00020000"/>
<uses-permission android:name="android.permission.VIBRATE" />
<!-- Note that the game doesn't truly support small screen resolutions, <!-- Note that the game doesn't truly support small screen resolutions,
it instead forces downscaling to work on these displays.--> it instead forces downscaling to work on these displays.-->

12
core/build.gradle
View File

@ -1,14 +1,6 @@
//FIXME currently an android library while small amounts of android-specific code remain in SPD-classes apply plugin: 'java-library'
apply plugin: 'com.android.library'
android { [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
compileSdkVersion appAndroidCompileSDK
defaultConfig {
//noinspection MinSdkTooLow
minSdkVersion appAndroidMinSDK
}
}
dependencies { dependencies {
api project(':SPD-classes') api project(':SPD-classes')

7
core/src/main/AndroidManifest.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.shatteredpixel.shatteredpixeldungeon">
<uses-feature android:glEsVersion="0x00020000"/>
</manifest>