chore: update to kotlin 1.7 (#4771)

* chore: update to kotlin 1.7 * build: update hilt from 2.39.1 to 2.42 fix: exhaustive use of when in ProductEditActivity.kt
openfoodfacts · Jun 20, 2022 · c7cafae · c7cafae
1 parent c508b43
commit c7cafae
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 2 deletions.
diff --git a/...ain/java/openfoodfacts/github/scrachx/openfood/features/compare/ProductCompareActivity.kt b/...ain/java/openfoodfacts/github/scrachx/openfood/features/compare/ProductCompareActivity.kt
@@ -119,6 +119,7 @@ class ProductCompareActivity : BaseActivity() {
         binding.navigationBottomInclude.bottomNavigation.selectNavigationItem(R.id.compare_products)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         photoReceiverHandler.onActivityResult(this, requestCode, resultCode, data) {

diff --git a/...java/openfoodfacts/github/scrachx/openfood/features/images/manage/ImagesManageActivity.kt b/...java/openfoodfacts/github/scrachx/openfood/features/images/manage/ImagesManageActivity.kt
@@ -543,6 +543,7 @@ class ImagesManageActivity : BaseActivity() {
     }
 
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         val isResultOk = resultCode == RESULT_OK

diff --git a/...java/openfoodfacts/github/scrachx/openfood/features/images/select/ImagesSelectActivity.kt b/...java/openfoodfacts/github/scrachx/openfood/features/images/select/ImagesSelectActivity.kt
@@ -141,6 +141,7 @@ class ImagesSelectActivity : BaseActivity() {
         return true
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         photoReceiverHandler.onActivityResult(this, requestCode, resultCode, data) { newPhotoFile ->

diff --git a/...n/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ProductEditActivity.kt b/...n/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ProductEditActivity.kt
@@ -477,6 +477,9 @@ class ProductEditActivity : BaseActivity() {
                 ProductImageField.NUTRITION -> {
                     imageNutritionFactsUploaded = true
                 }
+                else -> {
+                    // Do nothing
+                }
             }
 
             hideImageProgress(fragmentIndex, getString(R.string.image_uploaded_successfully))

diff --git a/.../openfoodfacts/github/scrachx/openfood/features/product/edit/ProductEditPhotosFragment.kt b/.../openfoodfacts/github/scrachx/openfood/features/product/edit/ProductEditPhotosFragment.kt
@@ -124,6 +124,7 @@ class ProductEditPhotosFragment : ProductEditFragment() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         photoReceiverHandler.onActivityResult(this, requestCode, resultCode, data) { newPhotoFile ->

diff --git a/...acts/github/scrachx/openfood/features/product/edit/ingredients/EditIngredientsFragment.kt b/...acts/github/scrachx/openfood/features/product/edit/ingredients/EditIngredientsFragment.kt
@@ -428,6 +428,7 @@ class EditIngredientsFragment : ProductEditFragment() {
         return targetMap
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         photoReceiverHandler.onActivityResult(this, requestCode, resultCode, data) {

diff --git a/...hub/scrachx/openfood/features/product/edit/nutrition/ProductEditNutritionFactsFragment.kt b/...hub/scrachx/openfood/features/product/edit/nutrition/ProductEditNutritionFactsFragment.kt
@@ -824,6 +824,9 @@ class ProductEditNutritionFactsFragment : ProductEditFragment() {
                 adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
                 unitSpinner.adapter = adapter
             }
+            else -> {
+                // Do nothing
+            }
         }
         try {
             if (preFillValues) {
@@ -945,6 +948,7 @@ class ProductEditNutritionFactsFragment : ProductEditFragment() {
     private fun getStarchValue() = starchEditText?.getFloatValue() ?: 0F
     private fun getStarchUnitSelectedIndex() = starchEditText?.unitSpinner?.selectedItemPosition ?: 0
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         photoReceiverHandler.onActivityResult(this, requestCode, resultCode, data) {

diff --git a/...nfoodfacts/github/scrachx/openfood/features/product/edit/overview/EditOverviewFragment.kt b/...nfoodfacts/github/scrachx/openfood/features/product/edit/overview/EditOverviewFragment.kt
@@ -844,6 +844,7 @@ class EditOverviewFragment : ProductEditFragment() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         // Scanned QR code returned

diff --git a/...n/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewActivity.kt b/...n/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewActivity.kt
@@ -129,6 +129,7 @@ class ProductViewActivity : BaseActivity(), IProductView, OnRefreshListener {
     }
 
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 

diff --git a/...n/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewFragment.kt b/...n/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewFragment.kt
@@ -75,6 +75,7 @@ class ProductViewFragment : Fragment(), IProductView, OnRefreshListener {
         binding.navigationBottomInclude.bottomNavigation.installBottomNavigation(requireActivity())
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == LOGIN_ACTIVITY_REQUEST_CODE && resultCode == Activity.RESULT_OK) {

diff --git a/...s/github/scrachx/openfood/features/product/view/environment/EnvironmentProductFragment.kt b/...s/github/scrachx/openfood/features/product/view/environment/EnvironmentProductFragment.kt
@@ -236,6 +236,7 @@ class EnvironmentProductFragment : BaseFragment() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 

diff --git a/...s/github/scrachx/openfood/features/product/view/ingredients/IngredientsProductFragment.kt b/...s/github/scrachx/openfood/features/product/view/ingredients/IngredientsProductFragment.kt
@@ -516,6 +516,7 @@ class IngredientsProductFragment : BaseFragment() {
             .into(binding.imageViewIngredients)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (ImagesManageActivity.isImageModified(requestCode, resultCode)) {

diff --git a/...facts/github/scrachx/openfood/features/product/view/nutrition/NutritionProductFragment.kt b/...facts/github/scrachx/openfood/features/product/view/nutrition/NutritionProductFragment.kt
@@ -556,6 +556,7 @@ class NutritionProductFragment : BaseFragment(), CustomTabActivityHelper.Connect
             .into(binding.imageViewNutrition)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 

diff --git a/...foodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt b/...foodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt
@@ -938,6 +938,7 @@ class SummaryProductFragment : BaseFragment(), ISummaryProductPresenter.View {
         doChooseOrTakePhotos()
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 

diff --git a/.../java/openfoodfacts/github/scrachx/openfood/features/productlists/ProductListsActivity.kt b/.../java/openfoodfacts/github/scrachx/openfood/features/productlists/ProductListsActivity.kt
@@ -198,6 +198,7 @@ class ProductListsActivity : BaseActivity(), SwipeController.Actions {
     private fun checkListNameExist(listName: String) =
         adapter.lists.firstOrNull { it.listName == listName } != null
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == 1 && resultCode == RESULT_OK && data!!.extras!!.getBoolean("update")) {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,10 +17,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    val kotlinVersion by extra("1.6.20")
+    val kotlinVersion by extra("1.7.0")
     val jacksonVersion by extra("2.12.3")
     val greendaoVersion by extra("3.3.0")
-    val hiltVersion by extra("2.39.1")
+    val hiltVersion by extra("2.42")
     repositories {
         google()
         mavenCentral()