diff --git a/app/build.gradle b/app/build.gradle index 53af9b9..756ac48 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,10 +20,10 @@ apply plugin: 'com.android.application' //apply plugin: 'jacoco' -//apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android' //apply plugin: 'kotlinx-serialization' //apply plugin: 'kotlin-android-extensions' -//apply plugin: 'kotlin-kapt' +apply plugin: 'kotlin-kapt' //apply plugin: 'kotlin-allopen' //apply plugin: 'androidx.navigation.safeargs.kotlin' apply plugin: 'com.google.firebase.crashlytics' @@ -42,21 +42,20 @@ compileSdkVersion build_versions.compile_sdk buildToolsVersion build_versions.build_tools - dataBinding { - enabled = true + buildFeatures { + dataBinding = true + // for view binding : + // viewBinding = true } -// viewBinding { -// enabled = true -// } -// kapt { -// correctErrorTypes true -// javacOptions { -// // Increase the max count of errors from annotation processors. -// // Default is 100. -// option("-Xmaxerrs", 500) -// } -// } + kapt { + correctErrorTypes true + javacOptions { + // Increase the max count of errors from annotation processors. + // Default is 100. + option("-Xmaxerrs", 500) + } + } defaultConfig { applicationId "net.dolden.dummyand" @@ -70,12 +69,12 @@ buildConfigField "boolean", "CRASHLYTICS", "true" javaCompileOptions { - annotationProcessorOptions { - arguments = [ - "room.schemaLocation" : "$projectDir/schemas".toString(), - "room.incremental" : "true", - "room.expandProjection": "true"] - } +// annotationProcessorOptions { +// arguments = [ +// "room.schemaLocation" : "$projectDir/schemas".toString(), +// "room.incremental" : "true", +// "room.expandProjection": "true"] +// } } } @@ -95,19 +94,22 @@ // is enabled. mappingFileUploadEnabled defaults to true if // minifyEnabled is true. shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-glide.pro', 'proguard-fresco.pro', 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-glide.pro', 'proguard-rules.pro' debuggable false +// manifestPlaceholders = [allowBackup: true, fullBackupContent: true, crashlyticsCollectionEnabled: true] } debug { - minifyEnabled true - firebaseCrashlytics { - // If you don't need crash reporting for your debug build, - // you can speed up your build by disabling mapping file uploading. - mappingFileUploadEnabled false - } - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-glide.pro', 'proguard-fresco.pro', 'proguard-rules.pro' + minifyEnabled false +// firebaseCrashlytics { +// // If you don't need crash reporting for your debug build, +// // you can speed up your build by disabling mapping file uploading. +// mappingFileUploadEnabled false +// } + + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-glide.pro', 'proguard-rules.pro' debuggable true - testCoverageEnabled !project.hasProperty('android.injected.invoked.from.ide') +// testCoverageEnabled !project.hasProperty('android.injected.invoked.from.ide') +// manifestPlaceholders = [allowBackup: false, fullBackupContent: false, crashlyticsCollectionEnabled: false] ext.enableCrashlytics = false } } @@ -119,13 +121,13 @@ sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } -// kotlinOptions { -// jvmTarget = "1.8" -// } + kotlinOptions { + jvmTarget = "1.8" + } sourceSets { androidTest.java.srcDirs += "src/test-common/java" test.java.srcDirs += "src/test-common/java" - test.java.srcDirs += "../networking/src/test/java" +// test.java.srcDirs += "../networking/src/test/java" } lintOptions { lintConfig rootProject.file('lint.xml') @@ -135,14 +137,6 @@ flavorDimensions "env" productFlavors { // May need to match branch name, passed by Jenkins PL as environment variable named BRANCH_NAME - systemtest { - resValue "string", "app_name", "DummyAnd STst" - //applicationIdSuffix ".stst" - applicationIdSuffix ".dev2" -// manifestPlaceholders = [errorBaseUrl : "https://systemtest-card.testonly.digital-me.nl/card", -// cardNodeBaseUrl: "https://systemtest-card.testonly.digital-me.nl/card", -// userNodeBaseUrl: "https://systemtest-user.testonly.digital-me.nl/user"] - } acceptance { resValue "string", "app_name", "DummyAnd Acc" @@ -176,7 +170,7 @@ if (variant.getBuildType().isMinifyEnabled()) { variant.getAssembleProvider().configure() { - it.doLast { + it.doLast { copy { from variant.mappingFile into output.outputFile.parent @@ -215,6 +209,19 @@ } } +//apply plugin: 'hunter-debug' +// +//debugHunterExt { +// runVariant = 'DEBUG' +//} + +//apply plugin: 'hunter-timing' +//timingHunterExt { +// runVariant = 'DEBUG' +//// whitelist = ['com.quinn.hunter.timing.DataSource'] +//// blacklist = ['com.quinn.hunter.timing.black'] +//} + dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') @@ -238,7 +245,7 @@ // kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.5.2' // // kapt deps.lifecycle.compiler -// implementation deps.kotlin.stdlib8 + implementation deps.kotlin.stdlib8 // implementation 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0-1.3.70-eap-274-2' // implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.5.0' implementation deps.firebase_crashlytics diff --git a/build.gradle b/build.gradle index 9af14f1..a80cd05 100644 --- a/build.gradle +++ b/build.gradle @@ -3,14 +3,14 @@ buildscript { apply from: 'versions.gradle' addRepos(repositories) - + ext { -// ktlintVersion = '0.33.0' + ktlintVersion = '0.33.0' } dependencies { classpath deps.android_gradle_plugin -// classpath deps.kotlin.plugin + classpath deps.kotlin.plugin // classpath deps.kotlin.serialization // classpath deps.kotlin.android_extensions // classpath deps.kotlin.allopen @@ -19,32 +19,35 @@ classpath deps.google_services.plugin // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files + //classpath 'com.netflix.nebula:gradle-lint-plugin:10.4.2' } - - repositories { + repositories { google() } } -//plugins { -// id "com.diffplug.gradle.spotless" version "3.27.2" -// -// // Example usage: -// // ./gradlew dependencyUpdates -Drevision=release -DoutputFormatter=plain -// id "com.github.ben-manes.versions" version "0.28.0" -//} +plugins { + id "com.diffplug.gradle.spotless" version "3.29.0" + + // Example usage: + // ./gradlew dependencyUpdates -Drevision=release -DoutputFormatter=plain + id "com.github.ben-manes.versions" version "0.28.0" +} + +//apply plugin: 'nebula.lint' +//gradleLint.rules = ['all-dependency'] // add as many rules here as you'd like allprojects { addRepos(repositories) } -//spotless { -// kotlin { -// target "**/*.kt" -// ktlint(ktlintVersion) -// } -//} + spotless { + kotlin { + target "**/*.kt" + ktlint(ktlintVersion) + } + } -task clean(type: Delete) { - delete rootProject.buildDir -} +//task clean(type: Delete) { +// delete rootProject.buildDir +//} diff --git a/versions.gradle b/versions.gradle index e0ae074..c5fde93 100644 --- a/versions.gradle +++ b/versions.gradle @@ -2,7 +2,7 @@ def versions = [:] versions.json = "20190722" versions.arch_core = "2.1.0" -versions.room = "2.2.4" +versions.room = "2.2.5" versions.lifecycle = "2.2.0" versions.fragment_ktx = " 1.2.3" versions.activity_ktx = "1.1.0" @@ -11,10 +11,10 @@ versions.legacy_support = "1.0.0" versions.recyclerview_selection = "1.1.0-rc01" versions.viewpager2 = "1.0.0" -versions.material = "1.1.0-rc02" +versions.material = "1.2.0-alpha06" versions.support = "1.1.0" -versions.app_compat = "1.2.0-alpha03" -versions.dagger = '2.26' +versions.app_compat = "1.2.0-beta01" +versions.dagger = '2.27' versions.assisted_inject = '0.5.0' versions.junit = '4.13' versions.espresso = "3.2.0" @@ -28,31 +28,31 @@ versions.mockito_all = "1.10.19" versions.mockito_android = '3.3.3' versions.dexmaker = "2.19.0" -versions.constraint_layout = "2.0.0-beta4" +versions.constraint_layout = "2.0.0-beta6" versions.glide = '4.11.0' versions.timber = "4.7.1" versions.slf4j = "1.7.28" -versions.android_gradle_plugin = '3.6.1' +versions.android_gradle_plugin = '4.0.0' versions.rxjava2 = "2.2.19" versions.rx_android = "2.1.1" versions.atsl_runner = "1.2.0" versions.atsl_rules = "1.2.0" versions.atsl_junit = "1.1.1" versions.hamcrest = "1.3" -versions.kotlin = '1.3.70' +versions.kotlin = '1.4-M2' versions.paging = "2.1.1" versions.navigation_testing = "1.0.0-alpha08" versions.navigation_plugin = "2.2.0" -versions.navigation = "2.2.1" +versions.navigation = "2.2.2" versions.work = "2.3.3" -versions.crashlytics_gradle_plugin = "2.0.0-beta02" +versions.crashlytics_gradle_plugin = "2.1.1" versions.google_services = "4.3.3" versions.vision = "20.0.0" -versions.firebase = "17.3.0" -versions.firebase_crashlytics = "17.0.0-beta01" -versions.firebase_messaging = "20.1.5" +versions.firebase = "17.4.2" +versions.firebase_crashlytics = "17.0.0" +versions.firebase_messaging = "20.2.0" versions.firebase_dynamic_links = "19.1.0" -versions.firebase_analytics = "17.3.0" +versions.firebase_analytics = "17.4.2" versions.firebase_ml_vision = "24.0.1" versions.firebase_ml_vision_image_label = "19.0.0" versions.firebase_ml_vision_automl = "18.0.3" @@ -61,8 +61,8 @@ versions.ui_automator = '2.2.0' versions.gson = '2.8.5' versions.ktx = '1.2.0' -versions.preference = '1.1.0' -versions.coroutines = '1.3.4' +versions.preference = '1.1.1' +versions.coroutines = '1.3.7' versions.data_binding_compiler = versions.android_gradle_plugin def deps = [:] @@ -151,7 +151,7 @@ kotlin.serialization = "org.jetbrains.kotlin:kotlin-serialization:$versions.kotlin" kotlin.allopen = "org.jetbrains.kotlin:kotlin-allopen:$versions.kotlin" kotlin.android_extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$versions.kotlin" -kotlin.version = "1.3.70" +kotlin.version = "$versions.kotlin" deps.kotlin = kotlin @@ -182,7 +182,7 @@ build_versions.min_sdk = 16 build_versions.compile_sdk = 29 build_versions.target_sdk = 29 -build_versions.build_tools = "29.0.0" +build_versions.build_tools = "29.0.2" ext.build_versions = build_versions def work = [:] @@ -248,7 +248,7 @@ handler.google() handler.jcenter() // handler.maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } - handler.maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' } + handler.maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } // For the support libraries handler.maven { url "https://maven.google.com" } // com.github.javiersantos:AppUpdater