Skip to content

Commit f48632b

Browse files
committed
Обновляем версии библиотек без изменения кода
1 parent 9c20bcb commit f48632b

File tree

7 files changed

+37
-34
lines changed

7 files changed

+37
-34
lines changed

app/build.gradle

+18-17
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ apply plugin: 'me.tatarka.retrolambda'
66

77
android {
88

9-
compileSdkVersion 23
10-
buildToolsVersion '23.0.3'
9+
compileSdkVersion 25
10+
buildToolsVersion '25.0.0'
1111

1212
defaultConfig {
1313
applicationId 'four.pda'
1414
versionCode Integer.parseInt(project.versionCode)
1515
versionName '1.7.0'
1616
minSdkVersion 16
17-
targetSdkVersion 23
17+
targetSdkVersion 25
1818
buildConfigField 'String', 'VCS_BRANCH', "\"${project.vcsBranch}\""
1919
buildConfigField 'String', 'VCS_COMMIT', "\"${project.vcsCommit}\""
2020
multiDexEnabled true
@@ -90,6 +90,8 @@ apt {
9090
}
9191
}
9292

93+
def supportVersion = '25.0.1'
94+
9395
dependencies {
9496

9597
compile project(':dao')
@@ -99,19 +101,18 @@ dependencies {
99101
apt 'org.androidannotations:androidannotations:3.3.2'
100102
compile 'org.androidannotations:androidannotations-api:3.3.2'
101103

102-
apt 'com.google.dagger:dagger-compiler:2.1'
103-
compile 'com.google.dagger:dagger:2.1'
104+
apt 'com.google.dagger:dagger-compiler:2.7'
105+
compile 'com.google.dagger:dagger:2.7'
104106
compile 'javax.annotation:javax.annotation-api:1.2'
105107

106-
def supportVersion = '23.3.0'
107108
compile "com.android.support:appcompat-v7:$supportVersion"
108109
compile "com.android.support:recyclerview-v7:$supportVersion"
109110
compile "com.android.support:design:$supportVersion"
110111
compile "com.android.support:support-annotations:$supportVersion"
111112

112113
compile 'com.google.android.gms:play-services-analytics:8.3.0'
113114

114-
compile 'com.squareup.okhttp3:okhttp:3.2.0'
115+
compile 'com.squareup.okhttp3:okhttp:3.4.2'
115116
compile 'com.squareup.picasso:picasso:2.5.2'
116117

117118
compile 'com.github.swapii:PersistentCookieJar:1.0.0'
@@ -120,23 +121,23 @@ dependencies {
120121

121122
compile 'de.greenrobot:eventbus:2.4.0'
122123

123-
provided 'frankiesardo:auto-parcel:1.0.1'
124-
apt 'frankiesardo:auto-parcel:1.0.1'
124+
provided 'frankiesardo:auto-parcel:1.0.3'
125+
apt 'frankiesardo:auto-parcel:1.0.3'
125126

126-
compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
127+
compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
127128
transitive = true;
128129
}
129130

130-
compile 'org.slf4j:slf4j-api:1.7.12'
131+
compile 'org.slf4j:slf4j-api:1.7.21'
131132

132-
compile 'com.github.rey5137:material:1.2.2'
133-
compile 'net.opacapp:multiline-collapsingtoolbar:1.0.0'
133+
compile 'com.github.rey5137:material:1.2.4'
134+
compile 'net.opacapp:multiline-collapsingtoolbar:1.3.1'
134135

135-
compile 'com.github.chrisbanes:PhotoView:1.3.0'
136+
compile 'com.github.chrisbanes:PhotoView:1.3.1'
136137

137138
androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
138-
androidTestCompile 'com.android.support.test:runner:0.4.1'
139-
androidTestCompile 'com.android.support.test:rules:0.4'
139+
androidTestCompile 'com.android.support.test:runner:0.5'
140+
androidTestCompile 'com.android.support.test:rules:0.5'
140141
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
141142
androidTestCompile ('com.android.support.test.espresso:espresso-core:2.2.1') {
142143
exclude group: 'com.squareup.dagger'
@@ -148,5 +149,5 @@ dependencies {
148149
}
149150

150151
configurations.all {
151-
resolutionStrategy.force 'com.android.support:support-annotations:23.0.0'
152+
resolutionStrategy.force "com.android.support:support-annotations:$supportVersion"
152153
}

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:2.1.3'
10+
classpath 'com.android.tools.build:gradle:2.2.2'
1111
classpath 'com.google.gms:google-services:1.5.0'
1212
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
1313
classpath 'io.fabric.tools:gradle:1.21.5'

client/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ targetCompatibility = JavaVersion.VERSION_1_7
55

66
dependencies {
77

8-
compile 'org.jsoup:jsoup:1.8.3'
9-
compile 'org.slf4j:slf4j-api:1.7.12'
10-
compile 'com.squareup.okhttp3:okhttp:3.1.1'
11-
compile 'org.apache.commons:commons-lang3:3.4'
8+
compile 'org.jsoup:jsoup:1.10.1'
9+
compile 'org.slf4j:slf4j-api:1.7.21'
10+
compile 'com.squareup.okhttp3:okhttp:3.4.2'
11+
compile 'org.apache.commons:commons-lang3:3.5'
1212

1313
testCompile 'junit:junit:4.12'
14-
testCompile 'commons-io:commons-io:2.4'
15-
testCompile 'org.slf4j:slf4j-simple:1.7.16'
14+
testCompile 'commons-io:commons-io:2.5'
15+
testCompile 'org.slf4j:slf4j-simple:1.7.21'
1616

1717
}

client/testapp/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ targetCompatibility = JavaVersion.VERSION_1_7
66
dependencies {
77

88
compile project(':client')
9-
compile 'org.slf4j:slf4j-simple:1.7.16'
10-
compile "com.squareup.okhttp3:okhttp-urlconnection:3.0.0"
11-
compile 'com.squareup.okhttp3:logging-interceptor:3.1.2'
9+
compile 'org.slf4j:slf4j-simple:1.7.21'
10+
compile 'com.squareup.okhttp3:okhttp-urlconnection:3.4.2'
11+
compile 'com.squareup.okhttp3:logging-interceptor:3.4.2'
1212

1313
}

dao/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apply plugin: 'com.android.library'
22

33
android {
44

5-
compileSdkVersion 23
6-
buildToolsVersion '23.0.3'
5+
compileSdkVersion 25
6+
buildToolsVersion '25.0.0'
77

88
/**
99
* Явное указание версии SDK нужно, чтобы при слиянии манифестов
@@ -13,7 +13,7 @@ android {
1313
*/
1414
defaultConfig {
1515
minSdkVersion 16
16-
targetSdkVersion 23
16+
targetSdkVersion 25
1717
}
1818

1919
}

html_templates/build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ targetCompatibility = JavaVersion.VERSION_1_7
55

66
dependencies {
77

8-
compile 'org.slf4j:slf4j-api:1.7.12'
9-
compile 'commons-io:commons-io:2.4'
8+
compile 'org.slf4j:slf4j-api:1.7.21'
9+
compile 'commons-io:commons-io:2.5'
10+
11+
//As of release 0.9.0 mustache.java is now Java 8 only. For Java 6/7 support use 0.8.x.
1012
compile 'com.github.spullara.mustache.java:compiler:0.8.18'
1113

1214
}

html_templates/demo_exporter/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111
compile project(':html_templates')
1212
compile project(':client')
1313

14-
compile 'org.slf4j:slf4j-simple:1.7.12'
15-
compile 'commons-io:commons-io:2.4'
14+
compile 'org.slf4j:slf4j-simple:1.7.21'
15+
compile 'commons-io:commons-io:2.5'
1616

1717
}

0 commit comments

Comments
 (0)