Skip to content

Commit

Permalink
Update dependencies (airbnb#1874)
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler authored Aug 25, 2021
1 parent ee795bf commit 6774302
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 53 deletions.
32 changes: 9 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,30 @@ import org.ajoberstar.grgit.Grgit

buildscript {
ext {
composeVersion = '1.0.0'
kotlinVersion = '1.5.10'
daggerVersion = '2.37'
composeVersion = '1.0.1'
kotlinVersion = '1.5.21'
daggerVersion = '2.38.1'
}

repositories {
google()
maven {
url "https://plugins.gradle.org/m2/"
}
gradlePluginPortal()
}
dependencies {
classpath 'org.ajoberstar:grgit:1.9.3'
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'org.ajoberstar:grgit:2.3.0'
classpath 'com.android.tools.build:gradle:7.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'org.ajoberstar:grgit:1.9.3'
classpath "net.ltgt.gradle:gradle-errorprone-plugin:2.0.1"
classpath "net.ltgt.gradle:gradle-errorprone-plugin:2.0.2"
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.32'
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0'
}
}

allprojects {
repositories {
google()
mavenCentral()
maven {
url "https://jitpack.io"
}
maven {
url "https://kotlin.bintray.com/kotlinx"
}
maven {
url "https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/"
}
maven {
url "https://oss.sonatype.org/content/repositories/snapshots/"
}
maven { url "https://jitpack.io" }
}
}

Expand Down
4 changes: 2 additions & 2 deletions issue-repro-compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ android {

dependencies {
implementation project(':lottie-compose')
implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
implementation 'androidx.activity:activity-compose:1.3.0-rc01'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.activity:activity-compose:1.3.1'
implementation "androidx.compose.ui:ui:$composeVersion"
implementation "androidx.compose.material:material:$composeVersion"
implementation "androidx.compose.material:material-icons-extended:$composeVersion"
Expand Down
2 changes: 1 addition & 1 deletion issue-repro/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ android {

dependencies {
implementation project(':lottie')
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("androidx.appcompat:appcompat:1.3.1")
}
4 changes: 2 additions & 2 deletions lottie-compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ dependencies {
api project(':lottie')
implementation "androidx.compose.foundation:foundation:$composeVersion"
implementation "androidx.compose.ui:ui:$composeVersion"
testImplementation 'org.robolectric:robolectric:4.4'
testImplementation 'org.robolectric:robolectric:4.6.1'
testImplementation 'androidx.collection:collection-ktx:1.1.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.1'
}
12 changes: 6 additions & 6 deletions lottie/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ mavenPublish {
}

dependencies {
implementation "androidx.appcompat:appcompat:1.0.0"
implementation "androidx.appcompat:appcompat:1.3.1"
// Do not upgrade to 2.0 because it will bring in Kotlin as a transitive dependency.
implementation("com.squareup.okio:okio:1.17.4")

annotationProcessor "com.uber.nullaway:nullaway:0.7.5"
errorprone "com.google.errorprone:error_prone_core:2.3.2"
annotationProcessor "com.uber.nullaway:nullaway:0.9.2"
errorprone "com.google.errorprone:error_prone_core:2.9.0"
errorproneJavac "com.google.errorprone:javac:9+181-r4173-1"

testImplementation "org.mockito:mockito-core:3.5.13"
testImplementation 'junit:junit:4.13.1'
testImplementation "org.robolectric:robolectric:4.4"
testImplementation "org.mockito:mockito-core:3.12.2"
testImplementation 'junit:junit:4.13.2'
testImplementation "org.robolectric:robolectric:4.6.1"
}

task sourcesJar(type: Jar) {
Expand Down
11 changes: 5 additions & 6 deletions sample-compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ dependencies {
implementation project(':lottie-compose')
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.activity:activity-ktx:1.2.3'
implementation 'androidx.activity:activity-compose:1.3.0-rc01'
implementation 'androidx.activity:activity-ktx:1.3.1'
implementation 'androidx.activity:activity-compose:1.3.1'
implementation 'androidx.appcompat:appcompat:1.4.0-alpha03'
implementation 'com.google.android.material:material:1.4.0'
implementation "androidx.compose.ui:ui:$composeVersion"
Expand All @@ -69,16 +69,15 @@ dependencies {

implementation "androidx.navigation:navigation-ui-ktx:2.3.5"

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1'

implementation "com.google.dagger:dagger:$daggerVersion"
kapt "com.google.dagger:dagger-compiler:$daggerVersion"

implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
implementation "com.google.accompanist:accompanist-coil:0.12.0"
implementation "com.google.accompanist:accompanist-pager-indicators:0.11.1"
implementation "com.google.accompanist:accompanist-coil:0.15.0"
implementation "com.google.accompanist:accompanist-pager-indicators:0.17.0"
implementation 'com.airbnb.android:mavericks:2.3.0'
implementation 'com.airbnb.android:mavericks-compose:2.1.0-alpha02'

Expand Down
25 changes: 12 additions & 13 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ dependencies {
implementation project(':lottie')
implementation 'androidx.multidex:multidex:2.0.1'

implementation "androidx.fragment:fragment-ktx:1.3.5"
implementation "androidx.appcompat:appcompat:1.3.0"
implementation "androidx.fragment:fragment-ktx:1.3.6"
implementation "androidx.appcompat:appcompat:1.3.1"
implementation "androidx.recyclerview:recyclerview:1.2.1"
implementation "androidx.paging:paging-runtime-ktx:3.0.0"
implementation "androidx.paging:paging-runtime-ktx:3.0.1"
implementation "androidx.cardview:cardview:1.0.0"
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation "androidx.browser:browser:1.3.0"
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
kapt "androidx.lifecycle:lifecycle-common-java8:2.3.1"
Expand All @@ -89,21 +89,20 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1'
implementation 'com.dlazaro66.qrcodereaderview:qrcodereaderview:2.0.2'
implementation 'com.github.PhilJay:MPAndroidChart:3.1.0'
implementation 'com.amazonaws:aws-android-sdk-s3:2.8.3'
implementation ('com.amazonaws:aws-android-sdk-mobile-client:2.8.3@aar') { transitive = true }
implementation ('com.amazonaws:aws-android-sdk-auth-userpools:2.8.3@aar') { transitive = true }
implementation 'com.google.code.gson:gson:2.8.7'
implementation 'com.amazonaws:aws-android-sdk-s3:2.28.0'
implementation ('com.amazonaws:aws-android-sdk-mobile-client:2.28.0@aar') { transitive = true }
implementation ('com.amazonaws:aws-android-sdk-auth-userpools:2.28.0@aar') { transitive = true }
implementation 'com.google.code.gson:gson:2.8.8'
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.github.bumptech.glide:glide:4.12.0'

debugImplementation 'androidx.fragment:fragment-testing:1.3.5'
debugImplementation 'androidx.fragment:fragment-testing:1.3.6'

testImplementation 'junit:junit:4.13.2'

Expand All @@ -113,7 +112,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.4.0'
androidTestImplementation 'androidx.test:rules:1.4.0'
androidTestImplementation 'com.squareup.okhttp3:okhttp:4.9.1'
androidTestImplementation 'io.jsonwebtoken:jjwt:0.9.0'
androidTestImplementation "org.mockito:mockito-android:2.28.2"
androidTestImplementation 'io.jsonwebtoken:jjwt:0.9.1'
androidTestImplementation "org.mockito:mockito-android:3.12.2"
androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
}

0 comments on commit 6774302

Please sign in to comment.