Skip to content

Commit

Permalink
Merge pull request #262 from hotwired/update-dependencies
Browse files Browse the repository at this point in the history
Update project dependencies
  • Loading branch information
mbarta authored Mar 17, 2023
2 parents 04a7d09 + be4c20e commit 463dc04
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
}
}

Expand Down
4 changes: 2 additions & 2 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.google.android.material:material:1.7.0'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.browser:browser:1.4.0'
implementation 'androidx.browser:browser:1.5.0'
implementation 'com.github.bumptech.glide:glide:4.14.2'

implementation project(':turbo')
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
22 changes: 11 additions & 11 deletions turbo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,16 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'org.jetbrains.kotlin:kotlin-reflect:1.7.20'
implementation 'com.google.android.material:material:1.7.0'
implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.0'
implementation 'com.google.android.material:material:1.8.0'

// AndroidX
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

// JSON
implementation 'com.google.code.gson:gson:2.10'
implementation 'com.google.code.gson:gson:2.10.1'

// Networking/API
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
Expand All @@ -88,21 +88,21 @@ dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'

// Exported AndroidX dependencies
api 'androidx.appcompat:appcompat:1.5.1'
api 'androidx.appcompat:appcompat:1.6.1'
api 'androidx.core:core-ktx:1.9.0'
api 'androidx.webkit:webkit:1.5.0'
api 'androidx.fragment:fragment-ktx:1.5.4'
api 'androidx.webkit:webkit:1.6.0'
api 'androidx.fragment:fragment-ktx:1.5.5'
api 'androidx.navigation:navigation-fragment-ktx:2.5.3'
api 'androidx.navigation:navigation-ui-ktx:2.5.3'

// Tests
testImplementation 'androidx.test:core:1.4.0' // Robolectric
testImplementation 'androidx.test:core:1.5.0' // Robolectric
testImplementation 'androidx.navigation:navigation-testing:2.5.3'
testImplementation 'androidx.arch.core:core-testing:2.1.0'
testImplementation 'androidx.arch.core:core-testing:2.2.0'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'org.robolectric:robolectric:4.8.1'
testImplementation 'org.mockito:mockito-core:4.8.1'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'org.robolectric:robolectric:4.9.2'
testImplementation 'org.mockito:mockito-core:4.11.0'
testImplementation 'com.nhaarman:mockito-kotlin:1.6.0'
testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0'
testImplementation 'junit:junit:4.13.2'
Expand Down

0 comments on commit 463dc04

Please sign in to comment.