Update Studio, use Kotlin JDK8

This commit is contained in:
TacoTheDank
2020-05-29 21:25:59 -04:00
parent 97912046da
commit ba8ea84c4e
4 changed files with 12 additions and 28 deletions

View File

@@ -42,9 +42,6 @@ android {
} }
} }
dexOptions {
}
flavorDimensions "version" flavorDimensions "version"
productFlavors { productFlavors {
libre { libre {
@@ -88,20 +85,23 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
} }
kotlinOptions {
jvmTarget = "1.8"
}
} }
def room_version = "2.2.5" def room_version = "2.2.5"
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.documentfile:documentfile:1.0.1'
implementation 'androidx.biometric:biometric:1.0.1' implementation 'androidx.biometric:biometric:1.0.1'
implementation "androidx.core:core-ktx:1.2.0" implementation 'androidx.core:core-ktx:1.2.0'
// To upgrade with style // To upgrade with style
implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.android.material:material:1.0.0'
// Database // Database

View File

@@ -3,14 +3,10 @@ buildscript {
ext.kotlin_version = '1.3.72' ext.kotlin_version = '1.3.72'
repositories { repositories {
jcenter() jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.android.tools.build:gradle:4.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
@@ -22,3 +18,7 @@ allprojects {
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
} }
} }
task clean(type: Delete) {
delete rootProject.buildDir
}

View File

@@ -7,14 +7,6 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 29 targetSdkVersion 29
versionCode 1
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
}
} }
resourcePrefix 'classic_' resourcePrefix 'classic_'

View File

@@ -7,14 +7,6 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 29 targetSdkVersion 29
versionCode 1
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
}
} }
resourcePrefix 'material_' resourcePrefix 'material_'