From d4dad00ea18197ab0442939956c236c8e8603e88 Mon Sep 17 00:00:00 2001 From: fluffybunny074 Date: Tue, 22 Dec 2020 12:20:29 -0600 Subject: [PATCH 1/3] Update build.gradle Android 4.1.1 Kotlin1.4.21 --- AboutMeDataBinding-Starter/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AboutMeDataBinding-Starter/build.gradle b/AboutMeDataBinding-Starter/build.gradle index 06a3a6e92..04e768333 100644 --- a/AboutMeDataBinding-Starter/build.gradle +++ b/AboutMeDataBinding-Starter/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' + ext.kotlin_version = "1.4.21" repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong From 231637b4ec114be61adc07a398016fe909feef00 Mon Sep 17 00:00:00 2001 From: fluffybunny074 Date: Tue, 22 Dec 2020 12:23:09 -0600 Subject: [PATCH 2/3] Update build.gradle Android 4.1.1 Kotlin 1.4.21 --- AboutMeDataBinding-Starter/app/build.gradle | 41 ++++++++++++++------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/AboutMeDataBinding-Starter/app/build.gradle b/AboutMeDataBinding-Starter/app/build.gradle index 337f03ef4..771444fc5 100644 --- a/AboutMeDataBinding-Starter/app/build.gradle +++ b/AboutMeDataBinding-Starter/app/build.gradle @@ -1,31 +1,46 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' + id 'kotlin-android' -apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' +} android { - compileSdkVersion 28 + compileSdkVersion 30 + buildToolsVersion "30.0.3" + defaultConfig { - applicationId "com.example.android.aboutme" + applicationId "com.softymcsoftware.aboutme" minSdkVersion 19 - targetSdkVersion 28 + targetSdkVersion 30 versionCode 1 versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - // Enable data binding here. + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.0.2' - testImplementation 'junit:junit:4.12' + + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + testImplementation 'junit:junit:4.13.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' } From dc3fe0ea8f5ae42cb2ff2e723f25e5d46b2e0e35 Mon Sep 17 00:00:00 2001 From: fluffybunny074 Date: Tue, 22 Dec 2020 12:28:26 -0600 Subject: [PATCH 3/3] Update build.gradle --- AboutMeDataBinding-Starter/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AboutMeDataBinding-Starter/app/build.gradle b/AboutMeDataBinding-Starter/app/build.gradle index 771444fc5..17df71456 100644 --- a/AboutMeDataBinding-Starter/app/build.gradle +++ b/AboutMeDataBinding-Starter/app/build.gradle @@ -9,7 +9,7 @@ android { buildToolsVersion "30.0.3" defaultConfig { - applicationId "com.softymcsoftware.aboutme" + applicationId "com.example.aboutme" minSdkVersion 19 targetSdkVersion 30 versionCode 1