Skip to content

Commit 6e4a94c

Browse files
Update Kotlin plugin and build scripts
1 parent 488ad18 commit 6e4a94c

File tree

3 files changed

+11
-20
lines changed

3 files changed

+11
-20
lines changed

build.gradle

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,22 @@
1414
* limitations under the License.
1515
*/
1616

17-
// Top-level build file where you can add configuration options common to
18-
// all sub-projects/modules.
19-
2017
buildscript {
2118
ext {
2219
app_compat_version = '1.1.0'
2320
constraint_layout_version = '1.1.3'
24-
kotlin_version = '1.3.50'
21+
kotlin_version = '1.3.72'
2522
leanback_version = '1.1.0-alpha02'
2623
material_version = '1.1.0-alpha10'
2724
support_lib_version = '1.0.0-beta01'
2825
}
29-
3026
repositories {
3127
google()
3228
jcenter()
3329
}
3430
dependencies {
3531
classpath 'com.android.tools.build:gradle:3.6.3'
3632
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
37-
38-
// NOTE: Do not place your application dependencies here; they belong
39-
// in the individual module build.gradle files
4033
}
4134
}
4235

@@ -46,3 +39,7 @@ allprojects {
4639
jcenter()
4740
}
4841
}
42+
43+
task clean(type: Delete) {
44+
delete rootProject.buildDir
45+
}

mediacontroller/build.gradle

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,40 +20,33 @@ apply plugin: 'kotlin-android-extensions'
2020

2121
android {
2222
compileSdkVersion 28
23-
24-
compileOptions {
25-
sourceCompatibility JavaVersion.VERSION_1_8
26-
targetCompatibility JavaVersion.VERSION_1_8
27-
}
28-
2923
defaultConfig {
3024
applicationId "com.example.android.mediacontroller"
3125
minSdkVersion 21
3226
targetSdkVersion 28
3327
versionCode 1
3428
versionName "1.0"
35-
3629
vectorDrawables.useSupportLibrary = true
3730
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
38-
3931
}
4032
buildTypes {
4133
release {
4234
minifyEnabled false
4335
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
4436
}
4537
}
38+
compileOptions {
39+
sourceCompatibility JavaVersion.VERSION_1_8
40+
targetCompatibility JavaVersion.VERSION_1_8
41+
}
4642
}
4743

4844
dependencies {
4945
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
50-
5146
implementation "androidx.appcompat:appcompat:$app_compat_version"
5247
implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version"
5348
implementation "androidx.cardview:cardview:$support_lib_version"
54-
implementation 'com.android.support:design:28.0.0'
55-
5649
implementation "androidx.leanback:leanback:$leanback_version"
57-
50+
implementation 'com.android.support:design:28.0.0'
5851
implementation "com.google.android.material:material:$material_version"
5952
}

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
rootProject.name='android-media-controller'
12
include ':mediacontroller'

0 commit comments

Comments
 (0)