- gradle-wrapper.properties upgrade

MayconCardoso · Mar 11, 2021 · a2f7a5e · a2f7a5e
1 parent dd3bfe9
commit a2f7a5e
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 41 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'androidx.navigation.safeargs'
+apply plugin: "androidx.navigation.safeargs.kotlin"
 apply plugin: 'com.adarshr.test-logger'
 
 android {
@@ -17,11 +16,8 @@ android {
             minifyEnabled false
         }
     }
-    android {
-        dataBinding {
-            enabled = true
-            enabledForTests = true
-        }
+    buildFeatures {
+        dataBinding true
     }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         // Versions - Application
         //==============================================================================================
         KOTLIN_VERSION = '1.4.31'
-        KOTLIN_COROUTINES_CORE = '1.4.2-native-mt'
+        KOTLIN_COROUTINES_CORE = '1.4.3'
 
         ANDROID_BUILD_TOOLS = '4.1.2'
         ANDROID_APCOMPACT = '1.2.0'
@@ -80,7 +80,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$ANDROID_BUILD_TOOLS"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
-        classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$GOOGLE_NAVIGATION_VERSION"
         classpath "com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0"
         classpath 'com.adarshr:gradle-test-logger-plugin:2.1.1'
     }

diff --git a/data/build.gradle b/data/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.adarshr.test-logger'
 

diff --git a/...mctech/stocktradetracking/domain/stock_share/interaction/SelectBestDailyStockShareCase.kt b/...mctech/stocktradetracking/domain/stock_share/interaction/SelectBestDailyStockShareCase.kt
@@ -11,7 +11,7 @@ class SelectBestDailyStockShareCase(
 ) : SelectStockStrategy {
 
   override fun execute(stockShareList: List<StockShare>, filter: StockFilter): SelectedStock? {
-    return groupStockShareListCase.transform(stockShareList).maxBy {
+    return groupStockShareListCase.transform(stockShareList).maxByOrNull {
       selectMaxByFilter(filter, it)
     }?.let {
       SelectedStock(

diff --git a/.../com/mctech/stocktradetracking/domain/stock_share/interaction/SelectBestStockShareCase.kt b/.../com/mctech/stocktradetracking/domain/stock_share/interaction/SelectBestStockShareCase.kt
@@ -10,7 +10,7 @@ class SelectBestStockShareCase(
   private val groupStockShareListCase: GroupStockShareListCase
 ) : SelectStockStrategy {
   override fun execute(stockShareList: List<StockShare>, filter: StockFilter): SelectedStock? {
-    return groupStockShareListCase.transform(stockShareList).maxBy {
+    return groupStockShareListCase.transform(stockShareList).maxByOrNull {
       selectMaxByFilter(filter, it)
     }?.let {
       SelectedStock(

diff --git a/...ctech/stocktradetracking/domain/stock_share/interaction/SelectWorstDailyStockShareCase.kt b/...ctech/stocktradetracking/domain/stock_share/interaction/SelectWorstDailyStockShareCase.kt
@@ -10,7 +10,7 @@ class SelectWorstDailyStockShareCase(
   private val groupStockShareListCase: GroupStockShareListCase
 ) : SelectStockStrategy {
   override fun execute(stockShareList: List<StockShare>, filter: StockFilter): SelectedStock? {
-    return groupStockShareListCase.transform(stockShareList).minBy {
+    return groupStockShareListCase.transform(stockShareList).minByOrNull {
       selectMinByFilter(filter, it)
     }?.let {
       SelectedStock(

diff --git a/...com/mctech/stocktradetracking/domain/stock_share/interaction/SelectWorstStockShareCase.kt b/...com/mctech/stocktradetracking/domain/stock_share/interaction/SelectWorstStockShareCase.kt
@@ -10,7 +10,7 @@ class SelectWorstStockShareCase(
   private val groupStockShareListCase: GroupStockShareListCase
 ) : SelectStockStrategy {
   override fun execute(stockShareList: List<StockShare>, filter: StockFilter): SelectedStock? {
-    return groupStockShareListCase.transform(stockShareList).minBy {
+    return groupStockShareListCase.transform(stockShareList).minByOrNull {
       selectMinByFilter(filter, it)
     }?.let {
       SelectedStock(

diff --git a/features/feature-stock-share-filter/build.gradle b/features/feature-stock-share-filter/build.gradle
@@ -1,13 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.adarshr.test-logger'
 
 android {
-    dataBinding {
-        enabled = true
-        enabledForTests = true
+    buildFeatures {
+        dataBinding true
     }
 }
 

diff --git a/features/feature-stock-share/build.gradle b/features/feature-stock-share/build.gradle
@@ -1,13 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.adarshr.test-logger'
 
 android {
-    dataBinding {
-        enabled = true
-        enabledForTests = true
+    buildFeatures {
+        dataBinding true
     }
 }
 

diff --git a/...om/mctech/stocktradetracking/feature/stock_share/list_position/StockShareListViewModel.kt b/...om/mctech/stocktradetracking/feature/stock_share/list_position/StockShareListViewModel.kt
@@ -24,7 +24,6 @@ import com.mctech.stocktradetracking.domain.stock_share.interaction.strategies.S
 import com.mctech.stocktradetracking.domain.stock_share_filter.entity.StockFilter
 import com.mctech.stocktradetracking.domain.stock_share_filter.interaction.ObserveCurrentFilterCase
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
@@ -36,7 +35,6 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.plus
 
-@ExperimentalCoroutinesApi
 open class StockShareListViewModel constructor(
   private val observeStockListCase: ObserveStockListStrategy,
   private val observeCurrentFilterCase: ObserveCurrentFilterCase,

diff --git a/features/feature-timeline-balance/build.gradle b/features/feature-timeline-balance/build.gradle
@@ -1,13 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.adarshr.test-logger'
 
 android {
-    dataBinding {
-        enabled = true
-        enabledForTests = true
+    buildFeatures {
+        dataBinding true
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Feb 28 22:39:26 GMT 2021
+#Thu Mar 11 19:53:35 GMT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/libraries/library-architecture-code-generator/build.gradle b/libraries/library-architecture-code-generator/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.adarshr.test-logger'
 
 dependencies {

diff --git a/...ng/library/architecture_code_generator/templates/StockTradeFeatureGradleModuleTemplate.kt b/...ng/library/architecture_code_generator/templates/StockTradeFeatureGradleModuleTemplate.kt
@@ -12,7 +12,6 @@ class StockTradeFeatureGradleModuleTemplate(moduleFilePath: ModuleFilePath) :
   override fun generate() = writeFile(this) { output ->
     output.println("apply plugin: 'com.android.library'")
     output.println("apply plugin: 'kotlin-android'")
-    output.println("apply plugin: 'kotlin-android-extensions'")
     output.println("apply plugin: 'kotlin-kapt'")
     output.blankLine()
 

diff --git a/libraries/library-chart/build.gradle b/libraries/library-chart/build.gradle
@@ -1,13 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.adarshr.test-logger'
 
 android {
-    dataBinding {
-        enabled = true
-        enabledForTests = true
+    buildFeatures {
+        dataBinding true
     }
 }
 

diff --git a/libraries/library-design-system/build.gradle b/libraries/library-design-system/build.gradle
@@ -1,13 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.adarshr.test-logger'
 
 android {
-    dataBinding {
-        enabled = true
-        enabledForTests = true
+    buildFeatures {
+        dataBinding true
     }
 }
 

diff --git a/libraries/library-logger-android/build.gradle b/libraries/library-logger-android/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.adarshr.test-logger'
 
 dependencies {