From d08c18fc3d6e67179afe5100d5c3886c22fdfc9d Mon Sep 17 00:00:00 2001 From: Florent Maitre Date: Mon, 28 Nov 2022 11:49:59 +0100 Subject: [PATCH 1/3] [#343] Update compile and target SDK versions to 33 --- .../kotlin/com/orange/ods/gradle/Versions.kt | 2 +- changelog.md | 1 + .../orange/ods/demo/ui/about/AboutScreen.kt | 6 +++-- .../utilities/compat/PackageManagerCompat.kt | 27 +++++++++++++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 demo/src/main/java/com/orange/ods/demo/ui/utilities/compat/PackageManagerCompat.kt diff --git a/buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt b/buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt index 50d7c3fc1..03fb958e5 100644 --- a/buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt +++ b/buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt @@ -12,7 +12,7 @@ package com.orange.ods.gradle object Versions { - const val compileSdk = 32 + const val compileSdk = 33 const val minSdk = 21 const val targetSdk = compileSdk diff --git a/changelog.md b/changelog.md index bab143b45..18170739b 100644 --- a/changelog.md +++ b/changelog.md @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - \[All\] Version numbers in changelog now display changes on GitHub when clicked ([#322](https://github.com/Orange-OpenSource/ods-android/issues/322)) - \[All\] Update documentation [#334](https://github.com/Orange-OpenSource/ods-android/issues/334) +- \[All\] Update compile and target SDK versions to 33 [#343](https://github.com/Orange-OpenSource/ods-android/issues/343) - \[Demo\] Add customization bottom sheets for buttons ([#303](https://github.com/Orange-OpenSource/ods-android/issues/303)) - \[Demo\] Replace action buttons switches by a counter in cards customization bottom sheet ([#327](https://github.com/Orange-OpenSource/ods-android/issues/327)) - \[Demo\] Add customization bottom sheets for sliders ([#307](https://github.com/Orange-OpenSource/ods-android/issues/307)) diff --git a/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt b/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt index 2ec23c2ef..1e0b5c7e7 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt @@ -40,8 +40,10 @@ import com.orange.ods.compose.theme.OdsTheme import com.orange.ods.demo.R import com.orange.ods.demo.ui.LocalMainThemeManager import com.orange.ods.demo.ui.LocalMainTopAppBarManager +import com.orange.ods.demo.ui.utilities.compat.PackageManagerCompat import com.orange.ods.demo.ui.utilities.composable.RadioButtonListItem import com.orange.ods.demo.ui.utilities.extension.versionCode +import com.orange.ods.utilities.extension.ifNotNull import com.orange.ods.utilities.extension.orElse @Composable @@ -109,8 +111,8 @@ fun AboutScreen(onAboutItemClick: (Long) -> Unit) { } private fun getVersion(context: Context): String { - val packageInfo = context.packageName?.let { packageName -> - context.packageManager?.getPackageInfo(packageName, 0) + val packageInfo = ifNotNull(context.packageManager, context.packageName) { packageManager, packageName -> + PackageManagerCompat.getPackageInfo(packageManager, packageName, 0) } return packageInfo?.let { String.format(context.resources.getString(R.string.about_app_version), packageInfo.versionName, packageInfo.versionCode()) diff --git a/demo/src/main/java/com/orange/ods/demo/ui/utilities/compat/PackageManagerCompat.kt b/demo/src/main/java/com/orange/ods/demo/ui/utilities/compat/PackageManagerCompat.kt new file mode 100644 index 000000000..ec152070d --- /dev/null +++ b/demo/src/main/java/com/orange/ods/demo/ui/utilities/compat/PackageManagerCompat.kt @@ -0,0 +1,27 @@ +/* + * + * Copyright 2021 Orange + * + * Use of this source code is governed by an MIT-style + * license that can be found in the LICENSE file or at + * https://opensource.org/licenses/MIT. + * / + */ + +package com.orange.ods.demo.ui.utilities.compat + +import android.content.pm.PackageInfo +import android.content.pm.PackageManager +import android.os.Build + +object PackageManagerCompat { + + @Suppress("DEPRECATION") + fun getPackageInfo(packageManager: PackageManager, packageName: String, value: Int): PackageInfo { + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + packageManager.getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(value.toLong())) + } else { + packageManager.getPackageInfo(packageName, value) + } + } +} From 9dfc132c2c70e4a207b97508595b42a17e7c00b5 Mon Sep 17 00:00:00 2001 From: Florent Maitre Date: Mon, 28 Nov 2022 15:10:24 +0100 Subject: [PATCH 2/3] [#343] Review: Update Android Gradle plugin to version 7.3.1 --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 35b523bc9..5c811ad51 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -26,7 +26,7 @@ java { } dependencies { - implementation("com.android.tools.build:gradle:7.2.0") + implementation("com.android.tools.build:gradle:7.3.1") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21") // https://issuetracker.google.com/issues/176079157#comment14 implementation("com.squareup:javapoet:1.13.0") // https://github.com/google/dagger/issues/3282 } diff --git a/buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt b/buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt index 03fb958e5..639a7767a 100644 --- a/buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt +++ b/buildSrc/src/main/kotlin/com/orange/ods/gradle/Versions.kt @@ -18,13 +18,13 @@ object Versions { const val accompanist = "0.23.1" const val activity = "1.4.0" - const val androidGradlePlugin = "7.2.0" + const val androidGradlePlugin = "7.3.1" const val appCompat = "1.5.1" const val browser = "1.3.0" const val compose = "1.2.0-rc02" const val core = "1.7.0" const val customViewPoolingContainer = "1.0.0" - const val googleServicesGradlePlugin = "4.3.10" + const val googleServicesGradlePlugin = "4.3.14" const val firebaseAppDistributionGradlePlugin = "3.0.1" const val firebaseBom = "30.0.0" const val firebaseCrashlyticsGradlePlugin = "2.8.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4d316527..0a829c871 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -7,7 +7,7 @@ # #Fri May 13 10:10:34 CEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 934f35c63e4204687fc55594a933e1a415eb5f6e Mon Sep 17 00:00:00 2001 From: Pauline Auvray Date: Mon, 28 Nov 2022 17:09:35 +0100 Subject: [PATCH 3/3] [#343] Update changelog --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 18170739b..05c3ba118 100644 --- a/changelog.md +++ b/changelog.md @@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - \[All\] Version numbers in changelog now display changes on GitHub when clicked ([#322](https://github.com/Orange-OpenSource/ods-android/issues/322)) - \[All\] Update documentation [#334](https://github.com/Orange-OpenSource/ods-android/issues/334) -- \[All\] Update compile and target SDK versions to 33 [#343](https://github.com/Orange-OpenSource/ods-android/issues/343) +- \[All\] Upgrade compile and target SDK versions to 33 [#343](https://github.com/Orange-OpenSource/ods-android/issues/343) - \[Demo\] Add customization bottom sheets for buttons ([#303](https://github.com/Orange-OpenSource/ods-android/issues/303)) - \[Demo\] Replace action buttons switches by a counter in cards customization bottom sheet ([#327](https://github.com/Orange-OpenSource/ods-android/issues/327)) - \[Demo\] Add customization bottom sheets for sliders ([#307](https://github.com/Orange-OpenSource/ods-android/issues/307))