Skip to content

Commit

Permalink
升级依赖库版本号
Browse files Browse the repository at this point in the history
  • Loading branch information
hpdx committed Aug 20, 2021
1 parent d69d6b5 commit fa4d11f
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 22 deletions.
17 changes: 10 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
.idea
/.idea/.name
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/misc.xml
/.idea/caches/build_file_checksums.ser
.DS_Store
.externalNativeBuild
/build
/captures
.externalNativeBuild
.idea/.name
/projectFilesBackup
.idea/misc.xml
/.idea/caches/build_file_checksums.ser
/local.properties
/projectFilesBackup
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ configurations.all {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
// implementation project(':fresco-helper')
implementation 'com.facebook.fresco.helper:fresco-helper:2.4.0'
implementation project(':fresco-helper')
// implementation 'com.facebook.fresco.helper:fresco-helper:2.4.0'

implementation 'com.hjq:xxpermissions:5.5'
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
// implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.recyclerview:recyclerview:1.1.0'

}
3 changes: 1 addition & 2 deletions app/src/main/res/layout/activity_photo_wall.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="2.5dp"
android:layout_marginRight="2.5dp"
android:scrollbars="vertical"/>
android:layout_marginRight="2.5dp" />

</RelativeLayout>
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.1'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
Expand All @@ -36,13 +36,13 @@ ext {
versionCode = 1
versionName = '1.0.0'

buildToolsVersion = '29.0.3'
compileSdkVersion = 29
buildToolsVersion = '30.0.3'
compileSdkVersion = 30

minSdk = 19
targetSdk = 29
targetSdk = 23

frescoVersion = '2.3.0'
frescoVersion = '2.5.0'
SSIVVersion = '3.10.0'
frescoHelperVersion = '2.4.0'

Expand Down
6 changes: 3 additions & 3 deletions fresco-helper/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ dependencies {
api 'com.facebook.fresco:animated-gif:' + rootProject.ext.frescoVersion
api 'com.facebook.fresco:webpsupport:' + rootProject.ext.frescoVersion
api 'com.facebook.fresco:animated-webp:' + rootProject.ext.frescoVersion
api 'com.davemorrissey.labs:subsampling-scale-image-view:' + rootProject.ext.SSIVVersion
api 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:' + rootProject.ext.SSIVVersion

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.google.android.material:material:1.2.0'
}

// Maven Group ID
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-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

0 comments on commit fa4d11f

Please sign in to comment.