diff --git a/app/build.gradle b/app/build.gradle index 5a2687ac9..3d488163e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ plugins { apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-parcelize' apply plugin: 'jacoco' apply plugin: 'androidx.navigation.safeargs.kotlin' apply plugin: 'com.google.android.gms.oss-licenses-plugin' @@ -398,10 +398,6 @@ android.applicationVariants.all { variant -> } } -androidExtensions { - experimental = true -} - // Generate Kotlin code for the Fenix Glean metrics. apply plugin: "org.mozilla.telemetry.glean-gradle-plugin" diff --git a/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt b/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt index d3724a374..c9b56ade3 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt @@ -10,7 +10,7 @@ import android.Manifest.permission.RECORD_AUDIO import android.content.Context import android.os.Parcelable import androidx.annotation.StringRes -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize import mozilla.components.concept.engine.permission.SitePermissions import mozilla.components.feature.sitepermissions.SitePermissionsRules import mozilla.components.support.ktx.android.content.isPermissionGranted diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/LoginsFragmentStore.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/LoginsFragmentStore.kt index 9ab138c30..3a1d743fa 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/LoginsFragmentStore.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/LoginsFragmentStore.kt @@ -5,7 +5,7 @@ package org.mozilla.fenix.settings.logins import android.os.Parcelable -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize import mozilla.components.concept.storage.Login import mozilla.components.lib.state.Action import mozilla.components.lib.state.State diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionMode.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionMode.kt index 08baeafb0..abcf61e0f 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionMode.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionMode.kt @@ -6,7 +6,7 @@ package org.mozilla.fenix.trackingprotection import android.os.Parcelable import androidx.annotation.StringRes -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize import org.mozilla.fenix.R @Parcelize diff --git a/config/detekt.yml b/config/detekt.yml index 8a28b5c78..a74cfe3ec 100644 --- a/config/detekt.yml +++ b/config/detekt.yml @@ -394,4 +394,4 @@ style: WildcardImport: active: true excludes: "**/*Test.kt, **/*Spec.kt, **/test/**, **/androidTest/**" - excludeImports: 'java.util.*,kotlinx.android.synthetic.*' + excludeImports: 'java.util.*'