checking all t he things

jaredly · Jan 13, 2018 · 133ba27 · 133ba27
1 parent b12640d
commit 133ba27
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 25 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -2,6 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.jaredforsyth.gravitron">
 
+    <!-- NOTE these are only needed for hot reloading to work -->
+    <!-- <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" /> -->
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

diff --git a/android/app/src/main/jniLibs/armeabi-v7a/libreasongl.so b/android/app/src/main/jniLibs/armeabi-v7a/libreasongl.so
diff --git a/android/app/src/main/jniLibs/x86/libreasongl.so b/android/app/src/main/jniLibs/x86/libreasongl.so
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,6 +1,3 @@
 include ':app'
 include ':reasongl-android'
-project(':reasongl-android').projectDir = new File(rootProject.projectDir, '../reasongl-android/android')
-
-
-
+project(':reasongl-android').projectDir = new File(rootProject.projectDir, '.././node_modules/@jaredly/reasongl-android/android') // GENERATED
diff --git a/bsconfig.json b/bsconfig.json
@@ -27,4 +27,8 @@
     "main-module": "Dev"
   }],
   "refmt": 3,
+  "icon": "./icons/icon.png",
+  "appName": "Gravitron",
+  "iosPathName": "Gravitron",
+  "androidPackage": "com.jaredforsyth.gravitron",
 }
diff --git a/ios/libreasongl.a b/ios/libreasongl.a
diff --git a/ios/reprocessing b/ios/reprocessing
@@ -0,0 +1 @@
+../node_modules/@jaredly/reasongl-ios/ios
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,9 +23,9 @@
   "license": "",
   "devDependencies": {
     "bs-platform": "bsansouci/bsb-native#fast",
-    "reprocessing-scripts": "1.3.1"
+    "reprocessing-scripts": "1.3.2"
   },
   "dependencies": {
-    "@jaredly/reprocessing": "1.1.2"
+    "@jaredly/reprocessing": "1.1.4"
   }
 }
diff --git a/src/androidhot.re b/src/androidhot.re
@@ -0,0 +1,2 @@
+
+Reprocessing.hotreload("./src/android.re")