Update to OTP-25

Author: dominicletz

.gitignore

@@ -3,6 +3,7 @@
 /app/release
 /local.properties
 /.idea/caches
+/.idea/misc.xml
 /.idea/libraries
 /.idea/modules.xml
 /.idea/workspace.xml

.idea/vcs.xml

@@ -2,38 +2,38 @@
 
 This Android Studio project wraps the [Desktop Sample App](https://github.com/elixir-desktop/desktop-example-app) to run on an Android phone.
 
-## How to build & run
+## Runtime Notes
 
-1. Install the beta OTP build *(see known issues)
-   
-1. Install [Android Studio](https://developer.android.com/studio) + NDK.
+The pre-built Erlang runtime for Android ARM/ARM64/x86 is embedded in this example git repository. These native runtime files include Erlang OTP and the exqlite nif to use SQLite on the mobile. These runtimes are generated using the CI of the [Desktop Runtime](https://github.com/elixir-desktop/runtimes) repository.
 
-1. Go to "Files -> New -> Project from Version Control" and enter this URL: https://github.com/elixir-desktop/android-example-app/ 
+Because Erlang OTP has many native hooks for networking and cryptographics the Erlang version used to compile your App must match the pre-built binary release that is embedded. In this example that is Erlang OTP 25.0.4. This sample is shipping with a `.tool-versions` file that `asdf` will automatically use to automate this requirement. 
 
-1. Update the `run_mix` to activate the correct Erlang/Elixir version during build.
+## How to build & run
 
-1. [Connect your Phone](https://developer.android.com/studio/run/device) to Android Studio
+1. Install [Android Studio](https://developer.android.com/studio) + NDK.
+1. Install git, npm, asdf
 
-1. Start the App
+```
+sudo apt install git npm curl
+git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.10.2
+echo ". $HOME/.asdf/asdf.sh" >> ~/.bashrc
+echo ". $HOME/.asdf/completions/asdf.bash" >> ~/.bashrc
+. $HOME/.asdf/asdf.sh
+```
 
-## Known todos
+1. Install Erlang-OTP (with openssl) in the same version 25.0.4 as the bundled runtime edition:
 
-### Update built-in Runtime
+```
+asdf install erlang 25.0.4
+asdf install elixir 1.13.4-otp-25
+```
 
-To have the embedded Erlang match the one you use for compilation you can install
-the same version as the embedded:
+1. Go to "Files -> New -> Project from Version Control" and enter this URL: https://github.com/elixir-desktop/android-example-app/ 
 
-```bash
-mkdir -p ~/projects/
-kerl build git https://github.com/diodechain/otp.git diode/beta 24.beta
-kerl install 24.beta ~/projects/24.beta
-```
+1. Start the App
 
-The current runtime that is precompiled and sits in assets/ folder is based on dev branch of OTP currently under
-https://github.com/diodechain/otp/tree/diode/beta
-Because the included OTP apps have different versions such as `crypto-5.0.3` you can only compile this project 
-with the very same OTP version. You can probably build it with `kerl`. But I'll update the runtime to a newer stable
-OTP build soon`(tm)` because all neccesary changes have been merged by the Erlang team already.
+
+## Known todos
 
 ### Initial Startup could be faster
 
@@ -45,10 +45,6 @@ This sample only launch the elixir app and shows it in an Android WebView. There
 
 ##  Other notes
 
-- The current sample is using __Android API 23__ and above
-
-- The Erlang runtime is for ease of use embedded in this example git repository. The native runtimes for Android ARM, ARM64 and X86_64 and the exqlite nif are are generated using the [Desktop Runtime](https://github.com/elixir-desktop/runtimes) repository. 
-
 - Android specific settings, icons and metadata are all contained in this Android Studio wrapper project. 
 
 - `Bridge.kt` and the native library are doing most of the wrapping of the Elixir runtime. 
@@ -62,4 +58,4 @@ This sample only launch the elixir app and shows it in an Android WebView. There
 
 ![App](/android_elixir.png?raw=true "Architecture")
 
-The Android App is initializing the Erlang VM and starting it up with a new environment variable `BRIDGE_PORT`. This environment variable is used by the `Bridge` project to connect to a local TCP server _inside the android app_. Through this new TCP communication channel all calls that usually would go to `wxWidgets` are now redirected. The Android side of things implements handling in `Bridge.kt`.  
+The Android App is initializing the Erlang VM and starting it up with a new environment variable `BRIDGE_PORT`. This environment variable is used by the `Bridge` project to connect to a local TCP server _inside the android app_. Through this new TCP communication channel all calls that usually would go to `wxWidgets` are now redirected. The Android side of things implements handling in `Bridge.kt`.  

README.md

@@ -0,0 +1,4 @@
+Erlang 25.0.4
+erlang 25.0.4
+Elixir 1.13.4-otp-25
+elixir 1.13.4-otp-25

app/.tool-versions

@@ -8,7 +8,7 @@ android {
     buildToolsVersion "30.0.3"
 
     task buildNum(type: Exec, description: 'Update Elixir App') {
-        commandLine '../run_mix', 'package.mobile'
+        commandLine './run_mix', 'package.mobile'
     }
 
     tasks.withType(JavaCompile) {

app/build.gradle

@@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+
+BASE=`pwd`
+APP_FILE="$BASE/src/main/assets/app.zip"
+export MIX_ENV=prod
+export MIX_TARGET=android
+
+if [ ! -d "elixir-app" ]; then
+  git clone https://github.com/elixir-desktop/desktop-example-app.git elixir-app
+fi
+
+# using the right runtime versions
+if [ ! -f "elixir-app/.tool-versions" ]; then
+  cp .tool-versions elixir-app/
+fi
+
+cd elixir-app
+
+if [ ! -d "deps/desktop" ]; then
+  mix local.hex --force
+  mix local.rebar
+  mix deps.get
+fi
+
+if [ ! -d "assets/node_modules" ]; then
+  cd assets && npm i && cd ..
+fi
+
+if [ -f "$APP_FILE" ]; then
+  rm "$APP_FILE"
+fi
+
+mix assets.deploy && \
+  mix release --overwrite && \
+  cd "_build/${MIX_TARGET}_${MIX_ENV}/rel/todo_app" && \
+  zip -9r "$APP_FILE" lib/ releases/ --exclude "*.so"
+

app/libs/erlang.jar

@@ -25,7 +25,9 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <activity android:name="io.elixirdesktop.example.MainActivity">
+        <activity
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|density|fontScale|keyboard|layoutDirection|mcc|mnc|navigation|smallestScreenSize|touchscreen|uiMode"
+            android:name="io.elixirdesktop.example.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />