android works again. lein droid doall
This commit is contained in:
@@ -10,6 +10,8 @@
|
|||||||
<application
|
<application
|
||||||
android:name="neko.App"
|
android:name="neko.App"
|
||||||
android:icon="@drawable/ic_launcher"
|
android:icon="@drawable/ic_launcher"
|
||||||
|
android:hardwareAccelerated="true"
|
||||||
|
android:largeHeap="true"
|
||||||
android:label="TicksTales">
|
android:label="TicksTales">
|
||||||
<activity android:name=".SplashActivity"
|
<activity android:name=".SplashActivity"
|
||||||
android:theme="@android:style/Theme.Translucent.NoTitleBar">
|
android:theme="@android:style/Theme.Translucent.NoTitleBar">
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
42
android/proguard-multi-dex.cfg
Normal file
42
android/proguard-multi-dex.cfg
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
-dontoptimize
|
||||||
|
-dontpreverify
|
||||||
|
-dontobfuscate
|
||||||
|
-dontskipnonpubliclibraryclasses
|
||||||
|
-verbose
|
||||||
|
-dontwarn
|
||||||
|
-dontnote
|
||||||
|
-forceprocessing
|
||||||
|
|
||||||
|
-keep class clojure.**
|
||||||
|
|
||||||
|
-keep class neko.**
|
||||||
|
|
||||||
|
-keep public class * extends android.app.Instrumentation {
|
||||||
|
<init>();
|
||||||
|
}
|
||||||
|
-keep public class * extends com.badlogic.gdx.backends.android.AndroidApplication
|
||||||
|
|
||||||
|
-keep public class * extends android.app.Application {
|
||||||
|
<init>();
|
||||||
|
void attachBaseContext(android.content.Context);
|
||||||
|
}
|
||||||
|
-keep public class * extends android.app.Activity {
|
||||||
|
<init>();
|
||||||
|
}
|
||||||
|
-keep public class * extends android.app.Service {
|
||||||
|
<init>();
|
||||||
|
}
|
||||||
|
-keep public class * extends android.content.ContentProvider {
|
||||||
|
<init>();
|
||||||
|
}
|
||||||
|
-keep public class * extends android.content.BroadcastReceiver {
|
||||||
|
<init>();
|
||||||
|
}
|
||||||
|
-keep public class * extends android.app.backup.BackupAgent {
|
||||||
|
<init>();
|
||||||
|
}
|
||||||
|
# We need to keep all annotation classes because proguard does not trace annotation attribute
|
||||||
|
# it just filter the annotation attributes according to annotation classes it already kept.
|
||||||
|
-keep public class * extends java.lang.annotation.Annotation {
|
||||||
|
*;
|
||||||
|
}
|
||||||
@@ -6,11 +6,10 @@
|
|||||||
[com.badlogicgames.gdx/gdx-box2d "1.5.3"]
|
[com.badlogicgames.gdx/gdx-box2d "1.5.3"]
|
||||||
[com.badlogicgames.gdx/gdx-tools "1.5.3"]
|
[com.badlogicgames.gdx/gdx-tools "1.5.3"]
|
||||||
|
|
||||||
[com.badlogicgames.gdx/gdx-bullet "1.5.3"]
|
|
||||||
|
|
||||||
[com.badlogicgames.gdx/gdx-backend-android "1.5.3"]
|
[com.badlogicgames.gdx/gdx-backend-android "1.5.3"]
|
||||||
[neko/neko "4.0.0-alpha5"]
|
[neko/neko "4.0.0-alpha5"]
|
||||||
[org.clojure-android/clojure "1.7.0-r2" :use-resources true]
|
[org.clojure-android/clojure "1.7.0-r2"]
|
||||||
|
|
||||||
[org.clojure/tools.nrepl "0.2.7"]
|
[org.clojure/tools.nrepl "0.2.7"]
|
||||||
[play-clj "0.4.5-BRYCE"]
|
[play-clj "0.4.5-BRYCE"]
|
||||||
@@ -26,7 +25,7 @@
|
|||||||
|
|
||||||
:rename-manifest-package "advent.core.debug"
|
:rename-manifest-package "advent.core.debug"
|
||||||
:manifest-options {:app-name "ticks tales (debug)"}
|
:manifest-options {:app-name "ticks tales (debug)"}
|
||||||
:aot-exclude-ns [cljs.core.async.impl.ioc-macros]}}
|
:aot-exclude-ns [cljs.core.async.macros cljs.core.impl-ioc-macros cljs.core.impl.ioc_macros]}}
|
||||||
:release {:android
|
:release {:android
|
||||||
{;; Specify the path to your private
|
{;; Specify the path to your private
|
||||||
;; keystore and the the alias of the
|
;; keystore and the the alias of the
|
||||||
@@ -53,8 +52,10 @@
|
|||||||
"cljs.core.async.impl.ioc-macros"
|
"cljs.core.async.impl.ioc-macros"
|
||||||
"cljs.core.impl.ioc_macros"
|
"cljs.core.impl.ioc_macros"
|
||||||
#"com.badlogic.gdx.physics\..+"]
|
#"com.badlogic.gdx.physics\..+"]
|
||||||
:dex-opts ["-JXmx8192M" "--multi-dex" "--no-locals"]}
|
:multi-dex true
|
||||||
|
:multi-dex-proguard-conf-path "proguard-multi-dex.cfg"
|
||||||
|
:dex-opts ["-JXmx8192M" "--no-locals"]}
|
||||||
|
|
||||||
:source-paths ["src/clojure" "../desktop/src-common"]
|
:source-paths ["src/clojure" "../desktop/src-common"]
|
||||||
:java-source-paths ["src/java" "gen"]
|
:java-source-paths ["src/java" "gen" ]
|
||||||
:javac-options ["-target" "1.6" "-source" "1.6" "-Xlint:-options"])
|
:javac-options ["-target" "1.6" "-source" "1.6" "-Xlint:-options"])
|
||||||
|
|||||||
@@ -9,8 +9,15 @@ import com.badlogic.gdx.Game;
|
|||||||
public class MainActivity extends AndroidApplication {
|
public class MainActivity extends AndroidApplication {
|
||||||
public void onCreate (android.os.Bundle savedInstanceState) {
|
public void onCreate (android.os.Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
try {
|
||||||
|
RT.var("clojure.core", "require").invoke(Symbol.intern("clojure.core.async"));
|
||||||
RT.var("clojure.core", "require").invoke(Symbol.intern("advent.core"));
|
RT.var("clojure.core", "require").invoke(Symbol.intern("advent.core"));
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.out.println("Importing failed");
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
|
|
||||||
Game game = (Game) RT.var("advent.core", "advent").deref();
|
Game game = (Game) RT.var("advent.core", "advent").deref();
|
||||||
initialize(game);
|
initialize(game);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
818663
android/test.txt
Normal file
818663
android/test.txt
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user