Skip to content

Commit 4510a08

Browse files
committed
Use plugin DSL
1 parent d9927bd commit 4510a08

File tree

8 files changed

+44
-29
lines changed

8 files changed

+44
-29
lines changed

app/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
1+
plugins {
2+
id "com.android.application"
3+
id "org.jetbrains.kotlin.android"
4+
}
35

46
android {
57
compileSdkVersion 28
@@ -39,7 +41,7 @@ dependencies {
3941
implementation project(':wordpress-comments')
4042
implementation project(':wordpress-shortcodes')
4143

42-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
44+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
4345

4446
implementation 'androidx.appcompat:appcompat:1.0.0'
4547
implementation "org.wordpress:utils:$wordpressUtilsVersion"

aztec/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-android'
1+
plugins {
2+
id "com.android.library"
3+
id "org.jetbrains.kotlin.android"
4+
}
35

46
android {
57
compileSdkVersion 28
@@ -46,7 +48,7 @@ android {
4648
}
4749

4850
dependencies {
49-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
51+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
5052

5153
implementation "org.ccil.cowan.tagsoup:tagsoup:$tagSoupVersion"
5254
implementation "org.jsoup:jsoup:$jSoupVersion"

build.gradle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildscript {
22
ext {
33
gradlePluginVersion = '3.3.1'
4-
kotlinVersion = '1.3.11'
54
kotlinCoroutinesVersion = '1.1.0'
65
supportLibVersion = '27.1.1'
76
tagSoupVersion = '1.2.1'
@@ -13,16 +12,6 @@ buildscript {
1312
wordpressUtilsVersion = '1.21'
1413
espressoVersion = '3.0.1'
1514
}
16-
17-
repositories {
18-
google()
19-
jcenter()
20-
}
21-
22-
dependencies {
23-
classpath "com.android.tools.build:gradle:$gradlePluginVersion"
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
25-
}
2615
}
2716

2817
allprojects {

glide-loader/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-android'
1+
plugins {
2+
id "com.android.library"
3+
id "org.jetbrains.kotlin.android"
4+
}
35

46
android {
57
compileSdkVersion 28
@@ -22,7 +24,7 @@ android {
2224
}
2325

2426
dependencies {
25-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
27+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
2628

2729
implementation project(':aztec')
2830
implementation "com.github.bumptech.glide:glide:$glideVersion"

picasso-loader/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-android'
1+
plugins {
2+
id "com.android.library"
3+
id "org.jetbrains.kotlin.android"
4+
}
35

46
android {
57
compileSdkVersion 28
@@ -21,7 +23,7 @@ android {
2123
}
2224

2325
dependencies {
24-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
26+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
2527

2628
implementation project(':aztec')
2729

settings.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
1+
pluginManagement {
2+
gradle.ext.kotlinVersion = '1.4.20'
3+
gradle.ext.agpVersion = '4.2.2'
4+
5+
plugins {
6+
id "com.android.library" version gradle.ext.agpVersion
7+
id "com.android.application" version gradle.ext.agpVersion
8+
id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion
9+
}
10+
repositories {
11+
gradlePluginPortal()
12+
google()
13+
}
14+
}
115
include ':app', ':aztec', ':glide-loader', ':picasso-loader', ':wordpress-comments', ':wordpress-shortcodes'

wordpress-comments/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-android'
1+
plugins {
2+
id "com.android.library"
3+
id "org.jetbrains.kotlin.android"
4+
}
35

46
android {
57
compileSdkVersion 28
@@ -33,7 +35,7 @@ android {
3335
}
3436

3537
dependencies {
36-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
38+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
3739

3840
implementation project(':aztec')
3941

wordpress-shortcodes/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-android'
1+
plugins {
2+
id "com.android.library"
3+
id "org.jetbrains.kotlin.android"
4+
}
35

46
android {
57
compileSdkVersion 28
@@ -32,7 +34,7 @@ android {
3234
}
3335

3436
dependencies {
35-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
37+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
3638

3739
implementation project(':aztec')
3840

0 commit comments

Comments
 (0)