.gitmodules

@@ -1,3 +1,3 @@
-[submodule "yggdrasil/yggdrasil-go"]
+[submodule "yggdrasil/yggdrasil-extras"]
-	path = yggdrasil/yggdrasil-go
+	path = yggdrasil/yggdrasil-extras
-	url = https://github.com/yggdrasil-network/yggdrasil-go
+	url = https://github.com/yggdrasil-network/yggdrasil-extras

app/build.gradle

@@ -6,21 +6,20 @@ def acraSecretsProperties = new Properties()
 acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile))
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 31
     defaultConfig {
         applicationId "io.github.chronosx88.yggdrasil"
         minSdkVersion 15
-        targetSdkVersion 32
+        targetSdkVersion 31
 
         versionCode 37
-        versionName "2.1.0"
+        versionName "2.0.19"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
 
         buildConfigField("String", "ACRA_BACKEND_URL", acraSecretsProperties['ACRA_BACKEND_URL'])
         buildConfigField("String", "ACRA_LOGIN", acraSecretsProperties['ACRA_LOGIN'])
         buildConfigField("String", "ACRA_PASSWORD", acraSecretsProperties['ACRA_PASSWORD'])
-        multiDexEnabled true
     }
 	signingConfigs {
 	  release {
@@ -78,18 +77,17 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':yggdrasil')
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
-    implementation 'com.google.android.material:material:1.7.0-alpha01'
+    implementation 'com.google.android.material:material:1.5.0-alpha04'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.vincentbrison.openlibraries.android:dualcache:3.1.1'
     implementation 'com.vincentbrison.openlibraries.android:dualcache-jsonserializer:3.1.1'
-    implementation 'com.android.support:multidex:1.0.3'
 
     testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test:runner:1.4.0'

app/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
+            android:usesCleartextTraffic="true"
             tools:ignore="GoogleAppIndexingWarning">
         <activity
                 android:name="org.yggdrasil.app.crispa.AboutActivity"

app/src/main/java/org/yggdrasil/app/crispa/YggApplication.kt

@@ -1,14 +1,14 @@
 package org.yggdrasil.app.crispa
 
+import android.app.Application
 import android.content.Context
-import androidx.multidex.MultiDexApplication
 import org.acra.config.dialog
 import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
 
-class YggApplication : MultiDexApplication() {
+class YggApplication : Application() {
     override fun attachBaseContext(base: Context) {
         super.attachBaseContext(base)
 

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

yggdrasil/Makefile

@@ -1,4 +1,7 @@
 all:
-	cd yggdrasil-go && ANDROID=true contrib/mobile/build
+	cd yggdrasil-extras; \
-	mv -f yggdrasil-go/yggdrasil.aar yggdrasil.aar;
+		gomobile bind -v -target android -tags mobile -o yggdrasil.aar \
-	mv -f yggdrasil-go/yggdrasil-sources.jar yggdrasil-sources.jar;
+		github.com/yggdrasil-network/yggdrasil-extras/src/mobile \
+		github.com/yggdrasil-network/yggdrasil-go/src/config
+	mv -f yggdrasil-extras/yggdrasil.aar yggdrasil.aar;
+	mv -f yggdrasil-extras/yggdrasil-sources.jar yggdrasil-sources.jar;

yggdrasil/yggdrasil-extras

@@ -0,0 +1 @@
+Subproject commit 21d029d6a42d64ec169dfa5d8db039ada07226da

yggdrasil/yggdrasil-go

@@ -1 +0,0 @@
-Subproject commit 42d4298e197e9f4455b9ed34e9b49847cc10af63