Clean up gradles

This commit is contained in:
TacoTheDank 2020-07-31 19:56:40 -04:00
parent 3e3a4645e9
commit 7f3aa5e9e1
3 changed files with 25 additions and 45 deletions

View file

@ -5,7 +5,7 @@ apply plugin: 'androidx.navigation.safeargs.kotlin'
android { android {
compileSdkVersion 29 compileSdkVersion 29
// buildToolsVersion is optional because the plugin uses a recommended version by default buildToolsVersion "29.0.3"
defaultConfig { defaultConfig {
applicationId 'org.y20k.trackbook' applicationId 'org.y20k.trackbook'
@ -25,63 +25,42 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
lintOptions{ lintOptions {
disable 'MissingTranslation' disable 'MissingTranslation', 'GoogleAppIndexingWarning'
} }
buildTypes { buildTypes {
release { release {
// Enables code shrinking, obfuscation, and optimization for only
// your project's release build type.
minifyEnabled true minifyEnabled true
// Enables resource shrinking, which is performed by the
// Android Gradle plugin.
shrinkResources true shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
// Includes the default ProGuard rules files that are packaged with
// the Android Gradle plugin. To learn more, go to the section about
// R8 configuration files.
proguardFiles getDefaultProguardFile(
'proguard-android-optimize.txt'),
'proguard-rules.pro'
} }
debug { debug {
// Comment out the below lines if you do not need to test resource shrinking applicationIdSuffix ".debug"
// minifyEnabled true
// shrinkResources true
// proguardFiles getDefaultProguardFile(
// 'proguard-android-optimize.txt'),
// 'proguard-rules.pro'
} }
} }
} }
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) // Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4'
// AndroidX
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.core:core-ktx:1.3.1"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.core:core-ktx:1.3.1'
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
implementation 'androidx.preference:preference-ktx:1.1.1'
implementation 'com.google.android.material:material:1.2.0-beta01'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' // Gson
implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' implementation 'com.google.code.gson:gson:2.8.6'
// OpenStreetMap
implementation "com.google.android.material:material:1.2.0-beta01" implementation 'org.osmdroid:osmdroid-android:6.1.8'
implementation "com.google.code.gson:gson:2.8.6"
implementation "org.osmdroid:osmdroid-android:6.1.8"
} }
androidExtensions { androidExtensions {

View file

@ -24,8 +24,7 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme" android:theme="@style/AppTheme">
tools:ignore="GoogleAppIndexingWarning">
<!-- MAIN ACTIVITY --> <!-- MAIN ACTIVITY -->
<activity android:name=".MainActivity"> <activity android:name=".MainActivity">

View file

@ -1,16 +1,19 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.3.72' ext {
kotlin_version = '1.3.72'
navigation_version = '2.3.0'
}
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.1' classpath 'com.android.tools.build:gradle:4.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
@ -20,7 +23,6 @@ allprojects {
repositories { repositories {
google() google()
jcenter() jcenter()
} }
} }