WallyHackenslacker/moasdawiki-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade library dependencies

Browse Source
This commit is contained in:
Herbert Reiter
2020-12-27 16:30:08 +01:00
parent 0cb372aa26
commit 09a2fb28f7
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+9 -7
View File
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 29 // 29 = Android 10 compileSdkVersion 30 // 30 = Android 11
defaultConfig { defaultConfig {
applicationId "net.moasdawiki.app" applicationId "net.moasdawiki.app"
minSdkVersion 26 // 26 = Oreo 8.0 minSdkVersion 26 // 26 = Oreo 8.0
targetSdkVersion 29 // should be same as compileSdkVersion targetSdkVersion 30 // should be same as compileSdkVersion
versionCode 19 versionCode 20
versionName "2.3.3.0" versionName "2.4.0.0"
archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
} }
sourceSets { sourceSets {
@@ -24,10 +24,12 @@ android {
} }
dependencies { dependencies {
implementation 'net.moasdawiki:moasdawiki-server:2.3.3' // HR: Workaround für Android Studio Bug
implementation files('/daten/wissensdb/moasdawiki-server-2.4.1.jar')
//implementation 'net.moasdawiki:moasdawiki-server:2.4.1'
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.preference:preference:1.1.1'
compileOnly 'org.jetbrains:annotations:19.0.0' compileOnly 'org.jetbrains:annotations:20.1.0'
testImplementation 'org.testng:testng:6.14.3' testImplementation 'org.testng:testng:7.3.0'
} }
build.gradle
+1 -1
View File
@@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.2' classpath 'com.android.tools.build:gradle:4.1.1'
// 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
gradle/wrapper/gradle-wrapper.properties
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
#Tue Sep 08 22:17:23 CEST 2020 #Sun Dec 27 12:01:31 CET 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip