diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 217acceded41572624dfcd6ced857d6df936c2c6..9985a8ed0ea7adb4648299f8be62cb46a9fe79e1 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 312203a3d01f1115096f6c5c7c786d2f737b2e4a..ef65ab1d1ee485f27e4502da299765daca96fbe8 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 7ec0c6ff99db5f2b66917e5d6691269d0d7cefc3..9c0315ce3a5bedee0e623a2baaa3ff1ee2344b88 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 11145919d78058d9b085c8cf3688e52add943f54..14facaa7be1bf05c322151d0fda29d86360a25e1 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 e48b32a88255e417dd97bbde77c51ab01a6eb9a4..fe7de2be20c3d6f2688a34a6ef1b77f64130a754 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)