Upgrade library dependencies
This commit is contained in:
+6
-4
@@ -1,11 +1,11 @@
|
|||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 31 // 31 = Android 12
|
compileSdkVersion 33 // 33 = Android 13
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "net.moasdawiki.app"
|
applicationId "net.moasdawiki.app"
|
||||||
minSdkVersion 28 // 28 = Android 9
|
minSdkVersion 28 // 28 = Android 9
|
||||||
targetSdkVersion 31 // should be same as compileSdkVersion
|
targetSdkVersion 33 // should be same as compileSdkVersion
|
||||||
versionCode 30
|
versionCode 30
|
||||||
versionName "3.4.4.0"
|
versionName "3.4.4.0"
|
||||||
archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
|
archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
|
||||||
@@ -23,9 +23,11 @@ android {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation 'net.moasdawiki:moasdawiki-server:3.4.4'
|
implementation 'net.moasdawiki:moasdawiki-server:3.4.4'
|
||||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
||||||
implementation 'androidx.appcompat:appcompat:1.4.1'
|
// androidx.appcompat:appcompat:1.5.0 causes dependency conflict, waiting for 1.5.1
|
||||||
|
// https://stackoverflow.com/questions/73406969/duplicate-class-androidx-lifecycle-viewmodellazy-found-in-modules-lifecycle-view
|
||||||
|
implementation 'androidx.appcompat:appcompat:1.4.2'
|
||||||
// androidx.preference 1.2.0 causes dependency conflict
|
// androidx.preference 1.2.0 causes dependency conflict
|
||||||
implementation 'androidx.preference:preference:1.1.1'
|
implementation 'androidx.preference:preference:1.1.1'
|
||||||
compileOnly 'org.jetbrains:annotations:23.0.0'
|
compileOnly 'org.jetbrains:annotations:23.0.0'
|
||||||
testImplementation 'org.testng:testng:7.5'
|
testImplementation 'org.testng:testng:7.6.1'
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ buildscript {
|
|||||||
google()
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.1.3'
|
classpath 'com.android.tools.build:gradle:7.2.2'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|||||||
Reference in New Issue
Block a user