Skip to content

Commit

Permalink
Merge pull request #460 from sunbeams001/minor-fix-53
Browse files Browse the repository at this point in the history
一些修改
  • Loading branch information
sunbeams001 committed Jan 24, 2022
2 parents 97c0636 + d69fd6f commit 144a4f3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.core:core-ktx:1.6.0'

api 'com.squareup.retrofit2:retrofit:2.9.0'
api 'com.squareup.retrofit2:converter-gson:2.9.0'
Expand Down Expand Up @@ -168,10 +168,10 @@ dependencies {
implementation 'com.makeramen:roundedimageview:2.3.0'


implementation 'com.github.liujingxing.rxhttp:rxhttp:2.8.0'
implementation 'com.github.liujingxing.rxhttp:rxhttp:2.7.3'
// okhttp3系列组件版本最高到 4.4.1,参看 RubySSLSocketFactory
implementation 'com.squareup.okhttp3:okhttp:4.4.1'
kapt 'com.github.liujingxing.rxhttp:rxhttp-compiler:2.8.0'
kapt 'com.github.liujingxing.rxhttp:rxhttp-compiler:2.7.3'

implementation 'io.reactivex.rxjava3:rxjava:3.1.3'
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
Expand Down Expand Up @@ -207,4 +207,4 @@ dependencies {
}
}

//lintKotlin.dependsOn(formatKotlin)
//lintKotlin.dependsOn(formatKotlin)
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.6.10'
ext.kotlin_version = '1.5.32'
repositories {
maven { url "https://jitpack.io" }
maven { url "https://plugins.gradle.org/m2/" }
Expand Down
2 changes: 1 addition & 1 deletion models/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.core:core-ktx:1.6.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
}
Expand Down

0 comments on commit 144a4f3

Please sign in to comment.