mirror of
https://github.com/yggdrasil-network/crispa-android.git
synced 2024-11-09 12:01:01 +00:00
1. upgraded app to multidex
2. target API upgrade 3. submodule fix
This commit is contained in:
parent
20d2a93e9f
commit
26ee584b55
@ -6,20 +6,21 @@ def acraSecretsProperties = new Properties()
|
||||
acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile))
|
||||
|
||||
android {
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 32
|
||||
defaultConfig {
|
||||
applicationId "io.github.chronosx88.yggdrasil"
|
||||
minSdkVersion 15
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 32
|
||||
|
||||
versionCode 37
|
||||
versionName "2.0.19"
|
||||
versionName "2.1.0"
|
||||
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 {
|
||||
@ -77,17 +78,18 @@ dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation project(path: ':yggdrasil')
|
||||
|
||||
implementation 'androidx.appcompat:appcompat:1.3.1'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
|
||||
implementation 'androidx.preference:preference-ktx:1.1.1'
|
||||
implementation 'androidx.appcompat:appcompat:1.4.1'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
|
||||
implementation 'androidx.preference:preference-ktx:1.2.0'
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||
|
||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
|
||||
implementation 'com.google.android.material:material:1.5.0-alpha04'
|
||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
|
||||
implementation 'com.google.android.material:material:1.7.0-alpha01'
|
||||
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'
|
||||
|
@ -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 : Application() {
|
||||
class YggApplication : MultiDexApplication() {
|
||||
override fun attachBaseContext(base: Context) {
|
||||
super.attachBaseContext(base)
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
all:
|
||||
cd yggdrasil && \
|
||||
cd yggdrasil-go && \
|
||||
ANDROID=true ./contrib/mobile/build
|
||||
mv -f yggdrasil/yggdrasil.aar yggdrasil.aar;
|
||||
mv -f yggdrasil/yggdrasil-sources.jar yggdrasil-sources.jar;
|
||||
|
Loading…
Reference in New Issue
Block a user