Skip to content

Commit 158a30a

Browse files
committed
Update DBFlow example to actual kotlin and android build tools versions
1 parent 25c4b56 commit 158a30a

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed
Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.0.1-2'
2+
ext.kotlin_version = '1.1.2-3'
33

44
repositories {
55
jcenter()
@@ -13,14 +13,15 @@ buildscript {
1313
apply plugin: 'com.android.application'
1414
apply plugin: 'kotlin-android'
1515
apply plugin: 'kotlin-android-extensions'
16+
apply plugin: 'kotlin-kapt'
1617

1718
android {
18-
compileSdkVersion 23
19-
buildToolsVersion '23.0.3'
19+
compileSdkVersion 25
20+
buildToolsVersion '25.0.3'
2021

2122
defaultConfig {
2223
minSdkVersion 14
23-
targetSdkVersion 23
24+
targetSdkVersion 25
2425
versionCode 1
2526
versionName '1.0'
2627
}
@@ -30,13 +31,13 @@ android {
3031

3132
}
3233

33-
def dbflow_version = "3.0.0-beta6"
34+
def dbflow_version = "4.0.1"
3435

3536
dependencies {
3637
// Android Support Libraries
37-
compile 'com.android.support:appcompat-v7:23.3.0'
38-
compile 'com.android.support:cardview-v7:23.3.0'
39-
compile 'com.android.support:recyclerview-v7:23.3.0'
38+
compile 'com.android.support:appcompat-v7:25.3.1'
39+
compile 'com.android.support:cardview-v7:25.3.1'
40+
compile 'com.android.support:recyclerview-v7:25.3.1'
4041

4142
// DBFlow
4243
kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflow_version}"
@@ -46,9 +47,4 @@ dependencies {
4647

4748
// Kotlin
4849
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
49-
50-
}
51-
52-
kapt {
53-
generateStubs = true
5450
}

gradle/android-dbflow/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
jcenter()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:2.1.0'
6+
classpath 'com.android.tools.build:gradle:2.3.0'
77
}
88
}
99

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Wed May 17 14:59:28 MSK 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)