Merge pull request #59 from yggdrasil-network/develop

2.0.19

Author: ChronosXYZ

.gitignore

@@ -17,3 +17,5 @@
 /app/src/main/assets/yggdrasil-0.3.8-linux-arm64
 /app/src/main/assets/yggdrasil-0.3.8-linux-armhf
 /.idea/
+
+acra.properties

.gitmodules

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

.idea/codeStyles/Project.xml

@@ -0,0 +1,3 @@
+ACRA_BACKEND_URL=""
+ACRA_LOGIN=""
+ACRA_PASSWORD=""

.idea/compiler.xml

@@ -1,16 +1,25 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
+def acraSecretsPropertiesFile = rootProject.file("acra.properties")
+def acraSecretsProperties = new Properties()
+acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile))
+
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     defaultConfig {
         applicationId "io.github.chronosx88.yggdrasil"
         minSdkVersion 15
-        targetSdkVersion 29
-        versionCode 23
-        versionName "2.0.3"
+        targetSdkVersion 31
+
+        versionCode 37
+        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'])
     }
 	signingConfigs {
 	  release {
@@ -68,19 +77,19 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':yggdrasil')
 
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     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.3.8'
-    implementation 'com.google.android.material:material:1.4.0-rc01'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    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'
 
     testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }