From c7cafaec69f840ecdaad093374f122641cf86bce Mon Sep 17 00:00:00 2001 From: VaiTon Date: Mon, 20 Jun 2022 19:35:57 +0200 Subject: [PATCH] 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 --- .../openfood/features/compare/ProductCompareActivity.kt | 1 + .../openfood/features/images/manage/ImagesManageActivity.kt | 1 + .../openfood/features/images/select/ImagesSelectActivity.kt | 1 + .../openfood/features/product/edit/ProductEditActivity.kt | 3 +++ .../features/product/edit/ProductEditPhotosFragment.kt | 1 + .../product/edit/ingredients/EditIngredientsFragment.kt | 1 + .../edit/nutrition/ProductEditNutritionFactsFragment.kt | 4 ++++ .../features/product/edit/overview/EditOverviewFragment.kt | 1 + .../openfood/features/product/view/ProductViewActivity.kt | 1 + .../openfood/features/product/view/ProductViewFragment.kt | 1 + .../product/view/environment/EnvironmentProductFragment.kt | 1 + .../product/view/ingredients/IngredientsProductFragment.kt | 1 + .../product/view/nutrition/NutritionProductFragment.kt | 1 + .../features/product/view/summary/SummaryProductFragment.kt | 1 + .../openfood/features/productlists/ProductListsActivity.kt | 1 + build.gradle.kts | 4 ++-- 16 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/compare/ProductCompareActivity.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/compare/ProductCompareActivity.kt index 6ff0aeea4af0..4401fb737ce3 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/compare/ProductCompareActivity.kt +++ b/app/src/main/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/images/manage/ImagesManageActivity.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/images/manage/ImagesManageActivity.kt index 887e05a1728a..e8b9d81946bf 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/images/manage/ImagesManageActivity.kt +++ b/app/src/main/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/images/select/ImagesSelectActivity.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/images/select/ImagesSelectActivity.kt index 136a51041afa..f707248eaa7d 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/images/select/ImagesSelectActivity.kt +++ b/app/src/main/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ProductEditActivity.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ProductEditActivity.kt index 8282e318ed32..4a240fe6093e 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ProductEditActivity.kt +++ b/app/src/main/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ProductEditPhotosFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ProductEditPhotosFragment.kt index 05d4c88d195a..455b8ad5fe7b 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ProductEditPhotosFragment.kt +++ b/app/src/main/java/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ingredients/EditIngredientsFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ingredients/EditIngredientsFragment.kt index cc8d017f2472..9bb94848dbb8 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/ingredients/EditIngredientsFragment.kt +++ b/app/src/main/java/openfoodfacts/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/nutrition/ProductEditNutritionFactsFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/nutrition/ProductEditNutritionFactsFragment.kt index 40b531f651e3..72967480d849 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/nutrition/ProductEditNutritionFactsFragment.kt +++ b/app/src/main/java/openfoodfacts/github/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/overview/EditOverviewFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/overview/EditOverviewFragment.kt index 6d1715bc1f5d..994185c2505a 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/edit/overview/EditOverviewFragment.kt +++ b/app/src/main/java/openfoodfacts/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewActivity.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewActivity.kt index 18596c2c7d6f..96b6bb77b69c 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewActivity.kt +++ b/app/src/main/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewFragment.kt index 6a7b0fa63d5c..4058b270eb48 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewFragment.kt +++ b/app/src/main/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/environment/EnvironmentProductFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/environment/EnvironmentProductFragment.kt index 46296295c06b..48fbc73e4ace 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/environment/EnvironmentProductFragment.kt +++ b/app/src/main/java/openfoodfacts/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ingredients/IngredientsProductFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ingredients/IngredientsProductFragment.kt index 1de773e8478a..86bd698343dc 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ingredients/IngredientsProductFragment.kt +++ b/app/src/main/java/openfoodfacts/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/nutrition/NutritionProductFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/nutrition/NutritionProductFragment.kt index 298189cc7a04..0132b889f7d1 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/nutrition/NutritionProductFragment.kt +++ b/app/src/main/java/openfoodfacts/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt index 5016269d9ae4..990efcf1f55b 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt +++ b/app/src/main/java/openfoodfacts/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/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlists/ProductListsActivity.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlists/ProductListsActivity.kt index 163c8460c1aa..cd92a429f4eb 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlists/ProductListsActivity.kt +++ b/app/src/main/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 index 7e7890188340..562a1a56cfb9 100644 --- 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()