From c7faba66ff0208db9c845fd0b214053aeace41ab Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 3 May 2018 02:19:41 +0200
Subject: [PATCH] Updated libraries
Signed-off-by: Janne Koschinski <janne@kuschku.de>
---
app/build.gradle.kts | 2 +-
app/sampledata/libraries.json | 4 ++--
.../ui/clientsettings/about/AboutFragment.kt | 4 ++--
build.gradle.kts | 12 ------------
persistence/build.gradle.kts | 2 +-
5 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 217accede..9985a8ed0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -131,7 +131,7 @@ dependencies {
}
// App Arch Persistence
- withVersion("1.1.0-beta3") {
+ withVersion("1.1.0-rc1") {
implementation("android.arch.persistence.room", "runtime", version)
implementation("android.arch.persistence.room", "rxjava2", version)
kapt("android.arch.persistence.room", "compiler", version)
diff --git a/app/sampledata/libraries.json b/app/sampledata/libraries.json
index 312203a3d..ef65ab1d1 100644
--- a/app/sampledata/libraries.json
+++ b/app/sampledata/libraries.json
@@ -20,7 +20,7 @@
},
{
"name": "Android Architecture Components: Persistence",
- "version": "1.1.0-beta3",
+ "version": "1.1.0-rc1",
"license": {
"short_name": "Apache-2.0",
"full_name": "Apache License"
@@ -29,7 +29,7 @@
},
{
"name": "Android Architecture Components: Room",
- "version": "1.1.0-beta3",
+ "version": "1.1.0-rc1",
"license": {
"short_name": "Apache-2.0",
"full_name": "Apache License"
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
index 7ec0c6ff9..9c0315ce3 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
@@ -104,13 +104,13 @@ class AboutFragment : DaggerFragment() {
),
Library(
name = "Android Architecture Components: Persistence",
- version = "1.1.0-beta3",
+ version = "1.1.0-rc1",
license = apache2,
url = "https://android.googlesource.com/platform/frameworks/support/+/master/persistence"
),
Library(
name = "Android Architecture Components: Room",
- version = "1.1.0-beta3",
+ version = "1.1.0-rc1",
license = apache2,
url = "https://android.googlesource.com/platform/frameworks/support/+/master/persistence"
),
diff --git a/build.gradle.kts b/build.gradle.kts
index 11145919d..14facaa7b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,15 +35,3 @@ allprojects {
maven(url = "https://jitpack.io")
}
}
-
-subprojects {
- configurations.all {
- resolutionStrategy {
- eachDependency {
- if (requested.name == "kotlin-compiler-embeddable") {
- useVersion("1.2.31")
- }
- }
- }
- }
-}
diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
index e48b32a88..fe7de2be2 100644
--- a/persistence/build.gradle.kts
+++ b/persistence/build.gradle.kts
@@ -79,7 +79,7 @@ dependencies {
}
// App Arch Persistence
- withVersion("1.1.0-beta3") {
+ withVersion("1.1.0-rc1") {
implementation("android.arch.persistence.room", "runtime", version)
implementation("android.arch.persistence.room", "rxjava2", version)
kapt("android.arch.persistence.room", "compiler", version)
--
GitLab