Compare commits

..

No commits in common. "91ddb4f9916fba77489d5b0eb27e4fed7db0fe56" and "d6ac6fcca64865b203a281382a9e93670d756d24" have entirely different histories.

4 changed files with 21 additions and 22 deletions

View File

@ -10,9 +10,11 @@ android {
defaultConfig { defaultConfig {
applicationId "io.github.chronosx88.yggdrasil" applicationId "io.github.chronosx88.yggdrasil"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 33 targetSdkVersion 33
versionCode 42
versionName "2.1.6" versionCode 40
versionName "2.1.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
setProperty("archivesBaseName", project.getParent().name+"-"+versionName) setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
@ -36,7 +38,7 @@ android {
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
} }
ndkVersion "23.2.8568313" ndkVersion "21.2.6472646"
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
@ -44,19 +46,19 @@ android {
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = '1.8'
} }
lintOptions {
checkReleaseBuilds false
// Or, if you prefer, you can continue to check for errors in release builds,
// but continue the build even when errors are found:
abortOnError false
}
packagingOptions { packagingOptions {
resources { exclude 'META-INF/LICENSE'
excludes += ['META-INF/LICENSE', 'META-INF/NOTICE'] exclude 'META-INF/NOTICE'
}
} }
buildFeatures { buildFeatures {
viewBinding true viewBinding true
} }
lint {
abortOnError false
checkReleaseBuilds false
}
namespace 'org.yggdrasil.app.crispa'
} }
@ -82,8 +84,8 @@ dependencies {
implementation 'androidx.preference:preference-ktx:1.2.0' 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.6.1' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
implementation 'com.google.android.material:material:1.8.0-beta01' implementation 'com.google.android.material:material:1.8.0-alpha03'
implementation 'com.google.code.gson:gson:2.9.0' implementation 'com.google.code.gson:gson:2.9.0'
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'
@ -92,6 +94,6 @@ dependencies {
implementation 'androidx.work:work-runtime-ktx:2.7.1' implementation 'androidx.work:work-runtime-ktx:2.7.1'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.5.1' androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
} }

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools"
package="org.yggdrasil.app.crispa">
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/> <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

View File

@ -212,11 +212,7 @@ class MainActivity : AppCompatActivity() {
val sourceDir: String = this.applicationInfo.sourceDir val sourceDir: String = this.applicationInfo.sourceDir
val dexFile = DexFile(sourceDir) val dexFile = DexFile(sourceDir)
val cl = classLoader val cl = classLoader
try { val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl)
val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl)
} catch (_: NullPointerException){
//there is nothing we can do
}
} }
val versionName = findViewById<Button>(R.id.about) val versionName = findViewById<Button>(R.id.about)
versionName.text = """version:${BuildConfig.VERSION_NAME} build:${BuildConfig.VERSION_CODE} core:${Mobile.getVersion()}""" versionName.text = """version:${BuildConfig.VERSION_NAME} build:${BuildConfig.VERSION_CODE} core:${Mobile.getVersion()}"""

View File

@ -6,7 +6,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.3.1' classpath 'com.android.tools.build:gradle:7.2.2'
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