Skip to content
This repository has been archived by the owner on Jan 13, 2022. It is now read-only.

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
svenjacobs committed Jan 3, 2020
1 parent eccf499 commit 0abc9ca
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
4 changes: 2 additions & 2 deletions android-example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}

plugins {
id("com.android.application") version "3.5.1"
id("com.android.application") version "3.5.3"
kotlin("android") version "1.3.61"
kotlin("android.extensions") version "1.3.61"
id("com.github.ben-manes.versions") version "0.27.0"
Expand All @@ -30,7 +30,7 @@ android {

dependencies {
implementation("org.rewedigital.katana:katana-android:1.10.0")
implementation("org.rewedigital.katana:katana-androidx-viewmodel-savedstate:1.10.0-beta01")
implementation("org.rewedigital.katana:katana-androidx-viewmodel-savedstate:1.10.0-rc04")
implementation("androidx.appcompat:appcompat:1.1.0")
implementation("androidx.constraintlayout:constraintlayout:1.1.3")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.61")
Expand Down
6 changes: 3 additions & 3 deletions androidx-viewmodel-savedstate/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ configureBase(
publicationComponent = components["android"]
)

version = "1.10.0-beta01"
version = "1.10.0-rc04"

dependencies {
api(project(":core"))
api(project(":androidx-viewmodel")) {
exclude(group = "androidx.lifecycle", module = "lifecycle-viewmodel")
}
// Required by androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-beta01
api("androidx.fragment:fragment:1.2.0-beta02")
// Required by androidx.lifecycle:lifecycle-viewmodel-savedstate
api("androidx.fragment:fragment:1.2.0-rc04")
api(Dependencies.androidXLifecycleViewModelSavedState)
}
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ buildscript {
dependencies {
classpath(Dependencies.androidPlugin)
classpath(Dependencies.androidJunit5GradlePlugin)
classpath(Dependencies.androidMavenPublishPlugin)
}
}

Expand Down
1 change: 1 addition & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ dependencies {
implementation("de.mannodermaus.gradle.plugins:android-junit5:1.4.0.0")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.9.18")
implementation("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
implementation("digital.wup:android-maven-publish:3.6.3")
}
9 changes: 3 additions & 6 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
object Versions {
// Do not upgrade androidJunit5GradlePlugin and androidPlugin as this breaks ViewModel support (issue #7)
const val androidJunit5GradlePlugin = "1.4.0.0"
const val androidMavenPublishPlugin = "3.6.2"
const val androidPlugin = "3.3.2"
const val androidXCollection = "1.1.0"
const val androidXFragment = "1.1.0"
const val androidXLifecycleViewModel = "2.1.0"
const val androidXLifecycleViewModelSavedState = "1.0.0-beta01"
const val androidXLifecycleViewModelSavedState = "1.0.0-rc03"
const val gradleVersionsPlugin = "0.27.0"
const val kluent = "1.56"
const val kluent = "1.58"
const val kotlin = "1.3.61"
const val spek = "2.0.8"
const val spek = "2.0.9"
}

object Dependencies {
const val androidJunit5GradlePlugin =
"de.mannodermaus.gradle.plugins:android-junit5:${Versions.androidJunit5GradlePlugin}"
const val androidMavenPublishPlugin =
"digital.wup:android-maven-publish:${Versions.androidMavenPublishPlugin}"
const val androidPlugin = "com.android.tools.build:gradle:${Versions.androidPlugin}"
const val androidXCollection = "androidx.collection:collection:${Versions.androidXCollection}"
const val androidXFragment = "androidx.fragment:fragment:${Versions.androidXFragment}"
Expand Down

0 comments on commit 0abc9ca

Please sign in to comment.