Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ Because Erlang OTP has many native hooks for networking and cryptographics the E
. $HOME/.asdf/asdf.sh
```

1. Install Erlang-OTP (with openssl) in the same version 25.0.4 as the bundled runtime edition:
1. Install Erlang-OTP (with openssl) in the same version 26.2.5 as the bundled runtime edition:

```
asdf install erlang 25.0.4
asdf install elixir 1.13.4-otp-25
asdf install erlang 26.2.5
asdf install elixir 1.17.2-otp-26
```

1. Go to "Files -> New -> Project from Version Control" and enter this URL: https://github.com/elixir-desktop/android-example-app/
Expand Down
4 changes: 2 additions & 2 deletions app/.tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
erlang 25.0.4
elixir 1.14.5-otp-25
erlang 26.2.5
elixir 1.17.2-otp-26
33 changes: 16 additions & 17 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jetbrains.kotlin.android'
}

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"
namespace 'io.elixirdesktop.example'
compileSdk 33

task buildNum(type: Exec, description: 'Update Elixir App') {
commandLine './run_mix', 'package.mobile'
Expand All @@ -15,17 +15,17 @@ android {
compileTask -> compileTask.dependsOn buildNum
}


defaultConfig {
applicationId 'io.elixirdesktop.example'
minSdkVersion 23
targetSdkVersion 30
applicationId "io.elixirdesktop.example"
minSdk 29
targetSdk 33
versionCode 1
versionName "1.0"

ndk {
abiFilters "armeabi-v7a", "arm64-v8a" , "x86_64"
}

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
Expand All @@ -51,7 +51,7 @@ android {
externalNativeBuild {
cmake {
path file('src/main/cpp/CMakeLists.txt')
version '3.10.2'
version '3.22.1'
}
}
buildFeatures {
Expand All @@ -62,17 +62,16 @@ android {
useLegacyPackaging = true
}
}
namespace 'io.elixirdesktop.example'
}

dependencies {
implementation fileTree(dir: "libs", include: '*.jar')

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.5.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
}
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}
Binary file modified app/libs/erlang.jar
Binary file not shown.
14 changes: 10 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="internalOnly">

<uses-permission android:name="android.permission.INTERNET" />
Expand All @@ -8,10 +9,12 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:usesCleartextTraffic="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Default">
android:theme="@style/Theme.Default"
android:usesCleartextTraffic="true"
android:extractNativeLibs="true"
tools:targetApi="31">

<provider
android:name="androidx.core.content.FileProvider"
Expand All @@ -25,11 +28,14 @@

<activity
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|density|fontScale|keyboard|layoutDirection|mcc|mnc|navigation|smallestScreenSize|touchscreen|uiMode"
android:name="io.elixirdesktop.example.MainActivity">
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>

</manifest>
Binary file modified app/src/main/assets/arm64-v8a-runtime.zip
Binary file not shown.
Binary file modified app/src/main/assets/armeabi-v7a-runtime.zip
Binary file not shown.
Binary file modified app/src/main/assets/x86_64-runtime.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = "1.5.0"
ext.kotlin_version = "1.9.0"
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.2.2'
classpath 'com.android.tools.build:gradle:8.3.0'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jun 22 14:56:47 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME