summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-01-27 13:26:18 -0300
committerTorsten Grote <t@grobox.de>2020-01-27 15:32:41 -0300
commit8080e4b4e96655c79fda8cf1bc9b4d8f084dec00 (patch)
tree9b8f66bd3782d95c5f17a31ff8a62e96e5433601
parentf463d1bb8c090a145736235be1809a337352e5f4 (diff)
downloadmerchant-terminal-android-8080e4b4e96655c79fda8cf1bc9b4d8f084dec00.tar.gz
merchant-terminal-android-8080e4b4e96655c79fda8cf1bc9b4d8f084dec00.tar.bz2
merchant-terminal-android-8080e4b4e96655c79fda8cf1bc9b4d8f084dec00.zip
Upgrade libraries to latest stable versions
-rw-r--r--.idea/codeStyles/Project.xml3
-rw-r--r--.idea/misc.xml2
-rw-r--r--app/build.gradle35
-rw-r--r--build.gradle2
4 files changed, 20 insertions, 22 deletions
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ce889bd..a88ded0 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,8 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
+ <AndroidXmlCodeStyleSettings>
+ <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+ </AndroidXmlCodeStyleSettings>
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b6ea2b1..7bfef59 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index c1fc89b..1408c8a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 29
- buildToolsVersion "29.0.1"
+ buildToolsVersion "29.0.2"
defaultConfig {
applicationId "net.taler.merchantpos"
minSdkVersion 27
@@ -36,36 +36,31 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.0.2'
- implementation 'androidx.core:core-ktx:1.0.2'
- implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- implementation 'com.google.android.material:material:1.1.0-alpha09'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
+ implementation 'androidx.core:core-ktx:1.1.0'
+ implementation 'com.google.android.material:material:1.1.0-rc02'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test:runner:1.2.0'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
- implementation "androidx.recyclerview:recyclerview:1.1.0-beta02"
+ implementation "androidx.recyclerview:recyclerview:1.1.0"
-
- def nav_version = "2.1.0-rc01"
+ // Navigation
+ def nav_version = "2.2.0"
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
+ // ViewModel and LiveData
+ def lifecycle_version = "2.2.0"
+ implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+ implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
+
// HTTP Requests
implementation 'com.android.volley:volley:1.1.1'
// QR codes
implementation 'com.google.zxing:core:3.4.0'
- // ViewModel and LiveData
- def lifecycle_version = "2.0.0"
- implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
- implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
- kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
-
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
- // JSON literals and parsing
- implementation 'com.beust:klaxon:5.0.11'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'androidx.test:runner:1.2.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}
diff --git a/build.gradle b/build.gradle
index 4420c59..dfab280 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.0'
+ classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files