Skip to content

Commit 196dc2c

Browse files
lisawraylisawray
authored
Update library versions (#138)
1 parent 1e438ab commit 196dc2c

9 files changed

Lines changed: 51 additions & 58 deletions

File tree

‎build.gradle‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.1.60-eap-43'
4+
ext.kotlin_version = '1.2.10'
5+
ext.targetSdkVersion = 27
6+
ext.compileSdkVersion = 27
7+
ext.buildToolsVersion = '27.0.3'
8+
ext.minSdkVersion = 17
9+
ext.novodaBintrayVersion = '0.8.0'
10+
ext.supportLibVersion = '27.0.2'
11+
512
repositories {
613
jcenter()
7-
maven {
8-
url "https://dl.bintray.com/kotlin/kotlin-eap-1.1"
9-
}
1014
google()
1115
}
1216
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.0.0-beta7'
17+
classpath 'com.android.tools.build:gradle:3.0.1'
1418
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1519

1620
// NOTE: Do not place your application dependencies here; they belong
@@ -21,9 +25,6 @@ buildscript {
2125
allprojects {
2226
repositories {
2327
jcenter()
24-
maven {
25-
url "https://dl.bintray.com/kotlin/kotlin-eap-1.1"
26-
}
2728
google()
2829
}
2930
}

‎circle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ machine:
33
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
44
dependencies:
55
pre:
6-
- echo y | android update sdk --no-ui --all --filter android-26,extra-android-m2repository,build-tools-26.0.2
6+
- echo y | android update sdk --no-ui --all --filter android-27,extra-android-m2repository,build-tools-27.0.3
77
test:
88
post:
99
- cp -r library/build/test-results/* $CIRCLE_TEST_REPORTS

‎example-databinding/build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '26.0.2'
4+
compileSdkVersion rootProject.compileSdkVersion
5+
buildToolsVersion rootProject.buildToolsVersion
66
defaultConfig {
77
applicationId "com.xwray.groupie.example.databinding"
8-
minSdkVersion 17
9-
targetSdkVersion 25
8+
minSdkVersion rootProject.minSdkVersion
9+
targetSdkVersion rootProject.targetSdkVersion
1010
versionCode 1
1111
versionName "1.0"
1212
vectorDrawables.useSupportLibrary true
@@ -28,9 +28,9 @@ android {
2828
dependencies {
2929
compile project(':library-databinding')
3030
compile project(':example-shared')
31-
compile 'com.android.support:appcompat-v7:25.3.1'
32-
compile 'com.android.support:design:25.3.1'
33-
compile 'com.android.support:cardview-v7:25.3.1'
34-
compile 'com.android.support:support-vector-drawable:25.3.1'
35-
compile 'com.android.support:animated-vector-drawable:25.3.1'
31+
compile "com.android.support:appcompat-v7:$supportLibVersion"
32+
compile "com.android.support:design:$supportLibVersion"
33+
compile "com.android.support:cardview-v7:$supportLibVersion"
34+
compile "com.android.support:support-vector-drawable:$supportLibVersion"
35+
compile "com.android.support:animated-vector-drawable:$supportLibVersion"
3636
}

‎example-shared/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '26.0.2'
4+
compileSdkVersion rootProject.compileSdkVersion
5+
buildToolsVersion rootProject.buildToolsVersion
66

77
defaultConfig {
8-
minSdkVersion 17
9-
targetSdkVersion 25
8+
minSdkVersion rootProject.minSdkVersion
9+
targetSdkVersion rootProject.targetSdkVersion
1010
versionCode 1
1111
versionName "1.0"
1212
vectorDrawables.useSupportLibrary true
@@ -23,10 +23,10 @@ android {
2323

2424
dependencies {
2525
compile project (':library')
26-
compile 'com.android.support:recyclerview-v7:25.3.1'
27-
compile 'com.android.support:appcompat-v7:25.3.1'
28-
compile 'com.android.support:design:25.3.1'
29-
compile 'com.android.support:cardview-v7:25.3.1'
30-
compile 'com.android.support:support-vector-drawable:25.3.1'
31-
compile 'com.android.support:animated-vector-drawable:25.3.1'
26+
compile "com.android.support:recyclerview-v7:$supportLibVersion"
27+
compile "com.android.support:appcompat-v7:$supportLibVersion"
28+
compile "com.android.support:design:$supportLibVersion"
29+
compile "com.android.support:cardview-v7:$supportLibVersion"
30+
compile "com.android.support:support-vector-drawable:$supportLibVersion"
31+
compile "com.android.support:animated-vector-drawable:$supportLibVersion"
3232
}

‎example/build.gradle‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ apply plugin: 'kotlin-android-extensions'
55
buildscript {
66
repositories {
77
jcenter()
8-
maven {
9-
url "https://dl.bintray.com/kotlin/kotlin-eap-1.1"
10-
}
118
}
129
dependencies {
1310
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -20,13 +17,13 @@ androidExtensions {
2017
}
2118

2219
android {
23-
compileSdkVersion 25
24-
buildToolsVersion '26.0.2'
20+
compileSdkVersion rootProject.compileSdkVersion
21+
buildToolsVersion rootProject.buildToolsVersion
2522

2623
defaultConfig {
2724
applicationId "com.xwray.groupie.example"
28-
minSdkVersion 17
29-
targetSdkVersion 25
25+
minSdkVersion rootProject.minSdkVersion
26+
targetSdkVersion rootProject.targetSdkVersion
3027
versionCode 1
3128
versionName "1.0"
3229
vectorDrawables.useSupportLibrary true

‎library-databinding/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.novoda:bintray-release:0.5.0'
9+
classpath "com.novoda:bintray-release:$novodaBintrayVersion"
1010
}
1111
}
1212

1313
android {
14-
compileSdkVersion 25
15-
buildToolsVersion '26.0.2'
14+
compileSdkVersion rootProject.compileSdkVersion
15+
buildToolsVersion rootProject.buildToolsVersion
1616

1717
defaultConfig {
18-
minSdkVersion 15
19-
targetSdkVersion 25
18+
minSdkVersion rootProject.minSdkVersion
19+
targetSdkVersion rootProject.targetSdkVersion
2020
versionCode 20
2121
versionName "1.0"
2222
}
@@ -35,7 +35,7 @@ dependencies {
3535
provided('com.android.databinding:library:1.3.1') {
3636
transitive = false
3737
}
38-
provided('com.android.databinding:baseLibrary:2.3.2') {
38+
provided('com.android.databinding:baseLibrary:2.3.3') {
3939
transitive = false
4040
}
4141
compileOnly('com.xwray:groupie:2.0.0-alpha2')

‎library-kotlin-android-extensions/build.gradle‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ apply plugin: 'com.novoda.bintray-release'
66
buildscript {
77
repositories {
88
jcenter()
9-
maven {
10-
url "https://dl.bintray.com/kotlin/kotlin-eap-1.1"
11-
}
129
}
1310
dependencies {
1411
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1512
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
16-
classpath 'com.novoda:bintray-release:0.5.0'
13+
classpath "com.novoda:bintray-release:$novodaBintrayVersion"
1714
}
1815
}
1916

@@ -22,13 +19,13 @@ androidExtensions {
2219
}
2320

2421
android {
25-
compileSdkVersion 26
26-
buildToolsVersion "26.0.2"
22+
compileSdkVersion rootProject.compileSdkVersion
23+
buildToolsVersion rootProject.buildToolsVersion
2724

2825

2926
defaultConfig {
30-
minSdkVersion 17
31-
targetSdkVersion 26
27+
minSdkVersion rootProject.minSdkVersion
28+
targetSdkVersion rootProject.targetSdkVersion
3229
versionCode 1
3330
versionName "1.0"
3431

‎library-kotlin-android-extensions/src/main/java/com/xwray/groupie/kotlinandroidextensions/ViewHolder.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.xwray.groupie.kotlinandroidextensions
22

3-
import android.support.v7.widget.RecyclerView
43
import android.view.View
54
import kotlinx.android.extensions.LayoutContainer
65

76
class ViewHolder(override val containerView: View) : com.xwray.groupie.ViewHolder(containerView),
8-
LayoutContainer {
9-
}
7+
LayoutContainer

‎library/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.novoda:bintray-release:0.5.0'
9+
classpath "com.novoda:bintray-release:$novodaBintrayVersion"
1010
}
1111
}
1212

1313
android {
14-
compileSdkVersion 25
15-
buildToolsVersion '26.0.2'
14+
compileSdkVersion rootProject.compileSdkVersion
15+
buildToolsVersion rootProject.buildToolsVersion
1616

1717
defaultConfig {
18-
minSdkVersion 15
19-
targetSdkVersion 25
18+
minSdkVersion rootProject.minSdkVersion
19+
targetSdkVersion rootProject.targetSdkVersion
2020
versionCode 1
2121
versionName "1.0"
2222
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -32,7 +32,7 @@ android {
3232
}
3333

3434
dependencies {
35-
compile 'com.android.support:recyclerview-v7:25.3.1'
35+
compile "com.android.support:recyclerview-v7:$supportLibVersion"
3636
testCompile 'junit:junit:4.12'
3737
testCompile 'org.mockito:mockito-core:1.10.19'
3838
}

0 commit comments

Comments
 (0)