mirror of
https://github.com/yggdrasil-network/crispa-android.git
synced 2024-10-22 11:21:02 +00:00
Compare commits
10 Commits
affdfeb3c1
...
82dc18c1e5
Author | SHA1 | Date | |
---|---|---|---|
|
82dc18c1e5 | ||
|
e583a68a62 | ||
|
8324ed2acc | ||
|
09d31bd1cd | ||
|
b078f795f9 | ||
|
7748e4a263 | ||
|
26ee584b55 | ||
|
20d2a93e9f | ||
|
61af98781a | ||
|
e77bd92b2f |
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -1,3 +1,3 @@
|
|||||||
[submodule "yggdrasil/yggdrasil-extras"]
|
[submodule "yggdrasil/yggdrasil-go"]
|
||||||
path = yggdrasil/yggdrasil-extras
|
path = yggdrasil/yggdrasil-go
|
||||||
url = https://github.com/yggdrasil-network/yggdrasil-extras
|
url = https://github.com/yggdrasil-network/yggdrasil-go
|
||||||
|
@ -6,20 +6,21 @@ def acraSecretsProperties = new Properties()
|
|||||||
acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile))
|
acraSecretsProperties.load(new FileInputStream(acraSecretsPropertiesFile))
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 31
|
compileSdkVersion 32
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "io.github.chronosx88.yggdrasil"
|
applicationId "io.github.chronosx88.yggdrasil"
|
||||||
minSdkVersion 15
|
minSdkVersion 15
|
||||||
targetSdkVersion 31
|
targetSdkVersion 32
|
||||||
|
|
||||||
versionCode 37
|
versionCode 37
|
||||||
versionName "2.0.19"
|
versionName "2.1.0"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
|
setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
|
||||||
|
|
||||||
buildConfigField("String", "ACRA_BACKEND_URL", acraSecretsProperties['ACRA_BACKEND_URL'])
|
buildConfigField("String", "ACRA_BACKEND_URL", acraSecretsProperties['ACRA_BACKEND_URL'])
|
||||||
buildConfigField("String", "ACRA_LOGIN", acraSecretsProperties['ACRA_LOGIN'])
|
buildConfigField("String", "ACRA_LOGIN", acraSecretsProperties['ACRA_LOGIN'])
|
||||||
buildConfigField("String", "ACRA_PASSWORD", acraSecretsProperties['ACRA_PASSWORD'])
|
buildConfigField("String", "ACRA_PASSWORD", acraSecretsProperties['ACRA_PASSWORD'])
|
||||||
|
multiDexEnabled true
|
||||||
}
|
}
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
@ -77,17 +78,18 @@ dependencies {
|
|||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation project(path: ':yggdrasil')
|
implementation project(path: ':yggdrasil')
|
||||||
|
|
||||||
implementation 'androidx.appcompat:appcompat:1.3.1'
|
implementation 'androidx.appcompat:appcompat:1.4.1'
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
|
||||||
implementation 'androidx.preference:preference-ktx:1.1.1'
|
implementation 'androidx.preference:preference-ktx:1.2.0'
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||||
|
|
||||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
|
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
|
||||||
implementation 'com.google.android.material:material:1.5.0-alpha04'
|
implementation 'com.google.android.material:material:1.7.0-alpha01'
|
||||||
implementation 'com.google.code.gson:gson:2.8.6'
|
implementation 'com.google.code.gson:gson:2.8.6'
|
||||||
implementation 'com.hbb20:ccp:2.4.0'
|
implementation 'com.hbb20:ccp:2.4.0'
|
||||||
implementation 'com.vincentbrison.openlibraries.android:dualcache:3.1.1'
|
implementation 'com.vincentbrison.openlibraries.android:dualcache:3.1.1'
|
||||||
implementation 'com.vincentbrison.openlibraries.android:dualcache-jsonserializer: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'
|
testImplementation 'junit:junit:4.13.1'
|
||||||
androidTestImplementation 'androidx.test:runner:1.4.0'
|
androidTestImplementation 'androidx.test:runner:1.4.0'
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:usesCleartextTraffic="true"
|
|
||||||
tools:ignore="GoogleAppIndexingWarning">
|
tools:ignore="GoogleAppIndexingWarning">
|
||||||
<activity
|
<activity
|
||||||
android:name="org.yggdrasil.app.crispa.AboutActivity"
|
android:name="org.yggdrasil.app.crispa.AboutActivity"
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
package org.yggdrasil.app.crispa
|
package org.yggdrasil.app.crispa
|
||||||
|
|
||||||
import android.app.Application
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import androidx.multidex.MultiDexApplication
|
||||||
import org.acra.config.dialog
|
import org.acra.config.dialog
|
||||||
import org.acra.config.httpSender
|
import org.acra.config.httpSender
|
||||||
import org.acra.data.StringFormat
|
import org.acra.data.StringFormat
|
||||||
import org.acra.ktx.initAcra
|
import org.acra.ktx.initAcra
|
||||||
import org.acra.sender.HttpSender
|
import org.acra.sender.HttpSender
|
||||||
|
|
||||||
class YggApplication : Application() {
|
class YggApplication : MultiDexApplication() {
|
||||||
override fun attachBaseContext(base: Context) {
|
override fun attachBaseContext(base: Context) {
|
||||||
super.attachBaseContext(base)
|
super.attachBaseContext(base)
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.0.4'
|
classpath 'com.android.tools.build:gradle:7.2.0'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
@ -1,7 +1,4 @@
|
|||||||
all:
|
all:
|
||||||
cd yggdrasil-extras; \
|
cd yggdrasil-go && ANDROID=true contrib/mobile/build
|
||||||
gomobile bind -v -target android -tags mobile -o yggdrasil.aar \
|
mv -f yggdrasil-go/yggdrasil.aar yggdrasil.aar;
|
||||||
github.com/yggdrasil-network/yggdrasil-extras/src/mobile \
|
mv -f yggdrasil-go/yggdrasil-sources.jar yggdrasil-sources.jar;
|
||||||
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;
|
|
||||||
|
@ -1 +0,0 @@
|
|||||||
Subproject commit 21d029d6a42d64ec169dfa5d8db039ada07226da
|
|
1
yggdrasil/yggdrasil-go
Submodule
1
yggdrasil/yggdrasil-go
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 42d4298e197e9f4455b9ed34e9b49847cc10af63
|
Loading…
Reference in New Issue
Block a user