diff --git a/app/build.gradle b/app/build.gradle index 18a837c..dfcbb07 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 31 // 31 = Android 12 + compileSdkVersion 33 // 33 = Android 13 defaultConfig { applicationId "net.moasdawiki.app" minSdkVersion 28 // 28 = Android 9 - targetSdkVersion 31 // should be same as compileSdkVersion + targetSdkVersion 33 // should be same as compileSdkVersion versionCode 30 versionName "3.4.4.0" archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode @@ -23,9 +23,11 @@ android { dependencies { implementation 'net.moasdawiki:moasdawiki-server:3.4.4' 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 implementation 'androidx.preference:preference:1.1.1' compileOnly 'org.jetbrains:annotations:23.0.0' - testImplementation 'org.testng:testng:7.5' + testImplementation 'org.testng:testng:7.6.1' } diff --git a/build.gradle b/build.gradle index 99b9aff..665ad18 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } 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 // in the individual module build.gradle files