From fb61c7a5f10c7f35f8a529ded45aeb9ce2ccc1fb Mon Sep 17 00:00:00 2001 From: German Proshunin Date: Sat, 4 Jul 2020 09:31:36 +0500 Subject: [PATCH] refactor gradle build --- app/build.gradle | 66 ++++++++++++++++++++++---------------------- build.gradle | 46 +++++++++++++++++++++++++++--- dmg2img/build.gradle | 4 +-- 3 files changed, 77 insertions(+), 39 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 11dbda6..498bee8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,14 +7,14 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 - buildToolsVersion '29.0.3' + compileSdkVersion rootProject.compileSdkVersion + buildToolsVersion rootProject.buildToolsVersion defaultConfig { applicationId "eu.depau.etchdroid" - minSdkVersion 21 - targetSdkVersion 29 - versionCode 11 - versionName "1.4" + minSdkVersion rootProject.minSdkVersion + targetSdkVersion rootProject.targetSdkVersion + versionCode rootProject.versionCode + versionName rootProject.versionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } @@ -45,33 +45,33 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core:1.3.0' - implementation 'androidx.fragment:fragment:1.2.5' - implementation 'androidx.preference:preference:1.1.1' - implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'com.google.android.material:material:1.1.0' - implementation 'com.google.guava:guava:29.0-jre' - - implementation 'com.github.Depau:kotlet-android:v0.2.5' + kapt "androidx.room:room-compiler:$roomVersion" implementation project(':dmg2img') - implementation 'me.jfenn:Attribouter:0.1.5' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" + implementation "me.jfenn:Attribouter:$attribouterVersion" + implementation "com.google.guava:guava:$guavaVersion" + implementation "com.google.code.gson:gson:$gsonVersion" + implementation "com.google.android.material:material:$materialVersion" + implementation "com.github.Depau:kotlet-android:$kotletAndroid" + implementation "androidx.swiperefreshlayout:swiperefreshlayout:$swipeRefreshLayoutVersion" + implementation "androidx.room:room-runtime:$roomVersion" + implementation "androidx.room:room-ktx:$roomVersion" + implementation "androidx.recyclerview:recyclerview:$recyclerViewVersion" + implementation "androidx.preference:preference:$preferenceVersion" + implementation "androidx.gridlayout:gridlayout:$gridLayoutVersion" + implementation "androidx.fragment:fragment:$fragmentVersion" + implementation "androidx.core:core:$coreVersion" + implementation "androidx.core:core-ktx:$ktxVersion" + implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion" + implementation "androidx.appcompat:appcompat:$appCompatVersion" + api "me.jahnen:libaums-libusbcommunication:$libUsbCommunicationVersion" + api "com.github.EtchDroid:libaums_wrapper:$libaumsWrapperVersion" + api "com.github.codekidX:storage-chooser:$storageChooserVersion" - implementation 'androidx.room:room-runtime:2.2.5' - kapt 'androidx.room:room-compiler:2.2.5' - implementation 'com.google.code.gson:gson:2.8.6' - - api 'com.github.codekidX:storage-chooser:2.0.4.4' - api 'com.github.EtchDroid:libaums_wrapper:v1.1' - api 'me.jahnen:libaums-libusbcommunication:0.1' - - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - testImplementation 'junit:junit:4.13' - testImplementation 'androidx.test:core:1.2.0' - testImplementation 'org.mockito:mockito-core:2.28.2' + // Testing dependencies + androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" + androidTestImplementation "androidx.test:runner:$runnerVersion" + testImplementation "androidx.test:core:$testCoreVersion" + testImplementation "junit:junit:$junitVersion" + testImplementation "org.mockito:mockito-core:$mockitoVersion" } diff --git a/build.gradle b/build.gradle index df620f9..bca1d2d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,56 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' + + ext { + // Sdk and tools + buildToolsVersion = '29.0.3' + compileSdkVersion = 29 + minSdkVersion = 21 + targetSdkVersion = 29 + versionCode = 11 + versionName = '1.4' + // App dependencies + appCompatVersion = '1.1.0' + attribouterVersion = '0.1.5' + constraintLayoutVersion = '1.1.3' + coreVersion = '1.3.0' + espressoVersion = '3.2.0' + fragmentVersion = '1.2.5' + gradleVersion = '4.0.0' + gridLayoutVersion = '1.0.0' + gsonVersion = '2.8.6' + guavaVersion = '29.0-jre' + junitVersion = '4.13' + kotletAndroid = '0.2.5' + kotlinVersion = '1.3.72' + ktxVersion = '1.3.0' + libaumsWrapperVersion = 'v1.1' + libUsbCommunicationVersion = '0.1' + materialVersion = '1.1.0' + mavenGradlePluginVersion = '2.1' + mockitoVersion = '2.28.2' + ndkVersion = '21.0.6113669' + preferenceVersion = '1.1.1' + recyclerViewVersion = '1.1.0' + roomVersion = '2.2.5' + runnerVersion = '1.2.0' + storageChooserVersion = '2.0.4.4' + swipeRefreshLayoutVersion = '1.1.0' + testCoreVersion = '1.2.0' + } + repositories { jcenter() google() maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.android.tools.build:gradle:$gradleVersion" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" // For libaums - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath "com.github.dcendents:android-maven-gradle-plugin:$mavenGradlePluginVersion" } } diff --git a/dmg2img/build.gradle b/dmg2img/build.gradle index 3d32f83..963ad01 100644 --- a/dmg2img/build.gradle +++ b/dmg2img/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 29 + compileSdkVersion rootProject.compileSdkVersion defaultConfig { externalNativeBuild { cmake { @@ -20,5 +20,5 @@ android { assets.srcDirs = ['src/main/assets'] } } - ndkVersion '21.0.6113669' + ndkVersion rootProject.ndkVersion } \ No newline at end of file