Skip to content

Commit aadf526

Browse files
authored
Update OTP 25 to 26 (#11)
* update runtime 25.0.4 -> 26.2.5 * update gradle and kotlin
1 parent a6e690d commit aadf526

File tree

10 files changed

+34
-29
lines changed

10 files changed

+34
-29
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Because Erlang OTP has many native hooks for networking and cryptographics the E
2121
. $HOME/.asdf/asdf.sh
2222
```
2323
24-
1. Install Erlang-OTP (with openssl) in the same version 25.0.4 as the bundled runtime edition:
24+
1. Install Erlang-OTP (with openssl) in the same version 26.2.5 as the bundled runtime edition:
2525
2626
```
27-
asdf install erlang 25.0.4
28-
asdf install elixir 1.13.4-otp-25
27+
asdf install erlang 26.2.5
28+
asdf install elixir 1.17.2-otp-26
2929
```
3030
3131
1. Go to "Files -> New -> Project from Version Control" and enter this URL: https://github.com/elixir-desktop/android-example-app/

app/.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
erlang 25.0.4
2-
elixir 1.14.5-otp-25
1+
erlang 26.2.5
2+
elixir 1.17.2-otp-26

app/build.gradle

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
plugins {
22
id 'com.android.application'
3-
id 'kotlin-android'
3+
id 'org.jetbrains.kotlin.android'
44
}
55

66
android {
7-
compileSdkVersion 30
8-
buildToolsVersion "30.0.3"
7+
namespace 'io.elixirdesktop.example'
8+
compileSdk 33
99

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

18+
1819
defaultConfig {
19-
applicationId 'io.elixirdesktop.example'
20-
minSdkVersion 23
21-
targetSdkVersion 30
20+
applicationId "io.elixirdesktop.example"
21+
minSdk 29
22+
targetSdk 33
2223
versionCode 1
2324
versionName "1.0"
2425

2526
ndk {
2627
abiFilters "armeabi-v7a", "arm64-v8a" , "x86_64"
2728
}
28-
2929
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
externalNativeBuild {
3131
cmake {
@@ -51,7 +51,7 @@ android {
5151
externalNativeBuild {
5252
cmake {
5353
path file('src/main/cpp/CMakeLists.txt')
54-
version '3.10.2'
54+
version '3.22.1'
5555
}
5656
}
5757
buildFeatures {
@@ -62,17 +62,16 @@ android {
6262
useLegacyPackaging = true
6363
}
6464
}
65-
namespace 'io.elixirdesktop.example'
6665
}
6766

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

71-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
72-
implementation 'androidx.core:core-ktx:1.5.0'
73-
implementation 'com.google.android.material:material:1.3.0'
74-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
75-
testImplementation 'junit:junit:4.+'
76-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
77-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
78-
}
70+
implementation 'androidx.core:core-ktx:1.9.0'
71+
implementation 'androidx.appcompat:appcompat:1.6.1'
72+
implementation 'com.google.android.material:material:1.8.0'
73+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
74+
testImplementation 'junit:junit:4.13.2'
75+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
76+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
77+
}

app/libs/erlang.jar

138 KB
Binary file not shown.

app/src/main/AndroidManifest.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
android:installLocation="internalOnly">
45

56
<uses-permission android:name="android.permission.INTERNET" />
@@ -8,10 +9,12 @@
89
android:allowBackup="true"
910
android:icon="@mipmap/ic_launcher"
1011
android:label="@string/app_name"
11-
android:usesCleartextTraffic="true"
1212
android:roundIcon="@mipmap/ic_launcher_round"
1313
android:supportsRtl="true"
14-
android:theme="@style/Theme.Default">
14+
android:theme="@style/Theme.Default"
15+
android:usesCleartextTraffic="true"
16+
android:extractNativeLibs="true"
17+
tools:targetApi="31">
1518

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

2629
<activity
2730
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|density|fontScale|keyboard|layoutDirection|mcc|mnc|navigation|smallestScreenSize|touchscreen|uiMode"
28-
android:name="io.elixirdesktop.example.MainActivity">
31+
android:name=".MainActivity"
32+
android:exported="true">
2933
<intent-filter>
3034
<action android:name="android.intent.action.MAIN" />
35+
3136
<category android:name="android.intent.category.LAUNCHER" />
3237
</intent-filter>
3338
</activity>
3439
</application>
35-
</manifest>
40+
41+
</manifest>
2.78 MB
Binary file not shown.
2.58 MB
Binary file not shown.
2.83 MB
Binary file not shown.

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = "1.5.0"
3+
ext.kotlin_version = "1.9.0"
44
repositories {
55
google()
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.2.2'
9+
classpath 'com.android.tools.build:gradle:8.3.0'
1010
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Jun 22 14:56:47 CEST 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)