Преглед на файлове

引用第三方gradle 升级

huyuguo преди 5 години
родител
ревизия
598eb725e7
променени са 7 файла, в които са добавени 40 реда и са изтрити 41 реда
  1. 3 3
      XRefreshView/build.gradle
  2. 5 6
      app/build.gradle
  3. 4 4
      autolayout/build.gradle
  4. 1 1
      library/build.gradle
  5. 1 1
      videolibrary/SmallVideoLib2/build.gradle
  6. 11 11
      videolibrary/picture_library/build.gradle
  7. 15 15
      zxing/build.gradle

+ 3 - 3
XRefreshView/build.gradle

@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
3 3
android {
4 4
    compileSdkVersion 26
5
    buildToolsVersion '28.0.3'
5
    buildToolsVersion '29.0.0'
6 6
7 7
    resourcePrefix "XRefreshView"
8 8
    defaultConfig {
@ -22,7 +22,7 @@ android {
22 22
    }
23 23
}
24 24
dependencies {
25
    compile 'com.android.support:recyclerview-v7:26.1.0'
26
    compile 'com.android.support:support-v4:26.1.0'
25
    api 'com.android.support:recyclerview-v7:26.1.0'
26
    api 'com.android.support:support-v4:26.1.0'
27 27
28 28
}

+ 5 - 6
app/build.gradle

@ -18,8 +18,7 @@ android {
18 18
            storePassword 'd1ev123'
19 19
        }
20 20
    }
21
    compileSdkVersion 27
22
//    buildToolsVersion '28.0.3'
21
    compileSdkVersion 26
23 22
    buildToolsVersion '29.0.0'
24 23
25 24
    aaptOptions.cruncherEnabled = false
@ -33,7 +32,7 @@ android {
33 32
    defaultConfig {
34 33
        applicationId "com.electric.chargingpile"
35 34
        minSdkVersion 19
36
        targetSdkVersion 27
35
        targetSdkVersion 26
37 36
38 37
        multiDexEnabled true
39 38
@ -182,7 +181,7 @@ dependencies {
182 181
    //    compile 'com.squareup.okhttp:okhttp:3.14.0'
183 182
    implementation 'com.squareup.okhttp:okhttp:2.0.0'
184 183
    implementation 'com.zhy:okhttputils:2.4.1'
185
    implementation 'com.android.support:support-v4:27.1.1'
184
    implementation 'com.android.support:support-v4:26.1.0'
186 185
    implementation 'com.google.android.gms:play-services-appindexing:9.4.0'
187 186
    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
188 187
    implementation 'com.zhy:flowlayout-lib:1.0.3'
@ -194,8 +193,8 @@ dependencies {
194 193
    implementation 'me.codeboy.android:align-text-view:2.3.0'
195 194
    implementation 'me.itangqi.waveloadingview:library:0.3.5'
196 195
    implementation 'com.yinglan.scrolllayout:scrolllayout:1.0.0'
197
    implementation 'com.android.support:appcompat-v7:27.1.1'
198
    implementation 'com.android.support:design:27.1.1'
196
    implementation 'com.android.support:appcompat-v7:26.1.0'
197
    implementation 'com.android.support:design:26.1.0'
199 198
    //    compile 'com.nineoldandroids:library:2.4.0'
200 199
//    compile 'com.github.bumptech.glide:glide:4.1.1'
201 200
    implementation 'com.github.bumptech.glide:glide:4.2.0'

+ 4 - 4
autolayout/build.gradle

@ -1,11 +1,11 @@
1 1
apply plugin: 'com.android.library'
2 2
3 3
android {
4
    compileSdkVersion 21
5
    buildToolsVersion '28.0.3'
4
    compileSdkVersion 26
5
    buildToolsVersion '29.0.0'
6 6
    defaultConfig {
7
        minSdkVersion 8
8
        targetSdkVersion 21
7
        minSdkVersion 19
8
        targetSdkVersion 26
9 9
        versionCode 1
10 10
        versionName "1.0"
11 11
    }

+ 1 - 1
library/build.gradle

@ -1,7 +1,7 @@
1 1
apply plugin: 'com.android.library'
2 2
android {
3 3
    compileSdkVersion 26
4
    buildToolsVersion '28.0.3'
4
    buildToolsVersion '29.0.0'
5 5
6 6
    defaultConfig {
7 7
        minSdkVersion 19

+ 1 - 1
videolibrary/SmallVideoLib2/build.gradle

@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
3 3
android {
4 4
    compileSdkVersion 26
5
    buildToolsVersion '28.0.3'
5
    buildToolsVersion '29.0.0'
6 6
    defaultConfig {
7 7
        minSdkVersion 19
8 8
        versionCode 11

+ 11 - 11
videolibrary/picture_library/build.gradle

@ -3,10 +3,10 @@ apply plugin: 'com.android.library'
3 3
android {
4 4
5 5
    compileSdkVersion 26
6
    buildToolsVersion '28.0.3'
6
    buildToolsVersion '29.0.0'
7 7
8 8
    defaultConfig {
9
        minSdkVersion 15
9
        minSdkVersion 19
10 10
        versionCode 1
11 11
        versionName "1.0"
12 12
    }
@ -19,14 +19,14 @@ android {
19 19
}
20 20
21 21
dependencies {
22
    compile 'com.android.support:appcompat-v7:26.1.0'
23
    compile 'com.android.support:recyclerview-v7:26.1.0'
22
    api fileTree(dir: 'libs', include: ['*.jar'])
23
    api 'com.android.support:appcompat-v7:26.1.0'
24
    api 'com.android.support:recyclerview-v7:26.1.0'
24 25
//    compile 'com.github.bumptech.glide:glide:4.1.1'
25
    compile 'com.github.bumptech.glide:glide:4.2.0'
26
    compile 'com.github.chrisbanes:PhotoView:1.3.0'
27
    compile 'io.reactivex.rxjava2:rxjava:2.0.5'
28
    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
29
    compile files('libs/isoviewer-1.0-RC-27.jar')
30
    compile project(':videolibrary:SmallVideoLib2')
31
    testCompile 'junit:junit:4.12'
26
    api 'com.github.bumptech.glide:glide:4.2.0'
27
    api 'com.github.chrisbanes:PhotoView:1.3.0'
28
    api 'io.reactivex.rxjava2:rxjava:2.0.5'
29
    api 'io.reactivex.rxjava2:rxandroid:2.0.1'
30
    api project(':videolibrary:SmallVideoLib2')
31
    testApi 'junit:junit:4.12'
32 32
}

+ 15 - 15
zxing/build.gradle

@ -1,11 +1,11 @@
1 1
apply plugin: 'com.android.library'
2 2
3 3
android {
4
    compileSdkVersion 25
5
    buildToolsVersion '28.0.3'
4
    compileSdkVersion 26
5
    buildToolsVersion '29.0.0'
6 6
    defaultConfig {
7
        minSdkVersion 15
8
        targetSdkVersion 22
7
        minSdkVersion 19
8
        targetSdkVersion 26
9 9
10 10
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
11 11
    }
@ -23,22 +23,22 @@ repositories {
23 23
}
24 24
25 25
dependencies {
26
    compile fileTree(include: ['*.jar'], dir: 'libs')
27
    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
26
    api fileTree(include: ['*.jar'], dir: 'libs')
27
    androidTestApi('com.android.support.test.espresso:espresso-core:2.2.2', {
28 28
        exclude group: 'com.android.support', module: 'support-annotations'
29 29
    })
30
    compile 'pub.devrel:easypermissions:0.2.0'
31
    compile 'com.google.code.gson:gson:2.2.4'
30
    api 'pub.devrel:easypermissions:0.2.0'
31
    api 'com.google.code.gson:gson:2.2.4'
32 32
//    compile 'com.github.bumptech.glide:glide:4.1.1'
33
    compile 'com.github.bumptech.glide:glide:4.2.0'
33
    api 'com.github.bumptech.glide:glide:4.2.0'
34 34
//    compile 'com.google.zxing:core:+'
35 35
//    compile 'com.google.zxing:android-core:+'
36 36
    // 扫码时防止24以下的系统奔溃
37
    compile 'com.google.zxing:core:3.3.3'
38
    compile 'com.google.zxing:android-core:3.2.0'
39
    compile 'com.blankj:utilcode:1.9.8'
40
    compile 'com.zhy:okhttputils:2.4.1'
41
    compile 'com.alibaba:fastjson:1.1.64.android'
42
    compile 'org.zackratos:ultimatebar:1.1.1'
37
    api 'com.google.zxing:core:3.3.3'
38
    api 'com.google.zxing:android-core:3.2.0'
39
    api 'com.blankj:utilcode:1.9.8'
40
    api 'com.zhy:okhttputils:2.4.1'
41
    api 'com.alibaba:fastjson:1.1.64.android'
42
    api 'org.zackratos:ultimatebar:1.1.1'
43 43
44 44
}