Skip to content

Commit 5edb47e

Browse files
committed
unify version
1 parent 35f0e8c commit 5edb47e

4 files changed

Lines changed: 14 additions & 24 deletions

File tree

build.gradle

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

3+
34
buildscript {
5+
apply from: "${rootDir.absolutePath}/ext.gradle"
46
repositories {
57
google()
68
jcenter()
@@ -9,6 +11,7 @@ buildscript {
911
dependencies {
1012
classpath "com.android.tools.build:gradle:$buildToolGradleVersion"
1113
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
14+
classpath "com.squareup.sqldelight:gradle-plugin:$sqldelightVersion"
1215
}
1316
}
1417

ext.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//ext {
2+
// buildToolGradleVersion = "3.3.0"
3+
// kotlinVersion = "1.3.11"
4+
// supportVersion = "28.0.0"
5+
// okHttpVersion = "3.14.0"
6+
// sqldelightVersion = "1.1.1"
7+
// androidXVersion = "1.0.0"
8+
//}

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#
44

55
buildToolGradleVersion = 3.3.0
6-
kotlinVersion = 1.3.11
6+
kotlinVersion = 1.3.21
77
supportVersion = 28.0.0
8-
okHttpVersion = 3.13.1
9-
sqldelightVersion = 1.0.3
8+
okHttpVersion = 3.14.0
9+
sqldelightVersion = 1.1.1
1010
androidXVersion = 1.0.0

lib/build.gradle

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ android {
2828
}
2929
}
3030

31-
ext {
32-
buildToolGradleVersion = "3.3.0"
33-
kotlinVersion = "1.3.11"
34-
supportVersion = "28.0.0"
35-
okHttpVersion = "3.13.1"
36-
sqldelightVersion = "1.1.1"
37-
androidXVersion = "1.0.0"
38-
}
3931

4032
dependencies {
4133
implementation fileTree(include: ['*.jar'], dir: 'libs')
@@ -46,19 +38,6 @@ dependencies {
4638
implementation "com.squareup.sqldelight:android-driver:${sqldelightVersion}"
4739
}
4840

49-
buildscript {
50-
ext {
51-
sqldelightVersion = "1.1.1"
52-
}
53-
repositories {
54-
google()
55-
mavenCentral()
56-
}
57-
dependencies {
58-
classpath "com.squareup.sqldelight:gradle-plugin:$sqldelightVersion"
59-
}
60-
}
61-
6241
sqldelight {
6342
UploadDatabase {
6443
}

0 commit comments

Comments
 (0)