new compose & kotlin 2

.gitignore

@@ -69,3 +69,18 @@ google-services.json
 /web/app.nginx
 /web/app.service
 /web/package.json
+
+# kotlin v 2.0
+.kotlin
+.kotlin/
+/.kotlin/
+
+dependencies.md
+
+documentation/app
+documentation/app/
+/documentation/app/
+
+documentation/lib
+/documentation/lib
+/documentation/lib/

app/build.gradle.kts

@@ -48,65 +48,3 @@ appConfig {
     }
 
 }
-
-//ospackage {
-//    packageName = 'foo'
-//    version = '1.2.3'
-//    release = '1'
-//    arch = I386
-//    os = LINUX
-//
-//    installUtils file('scripts/rpm/utils.sh')
-//    preInstall file('scripts/rpm/preInstall.sh')
-//    postInstall file('scripts/rpm/postInstall.sh')
-//    preUninstall 'touch /tmp/myfile'
-//    postUninstall file('scripts/rpm/postUninstall.sh')
-//
-//    requires('qux')
-//
-//    into '/opt/foo'
-//
-//    from(jar.outputs.files) {
-//        into 'lib'
-//    }
-//    from(configurations.runtime) {
-//        into 'lib'
-//    }
-//    from('lib') {
-//        into 'lib'
-//    }
-//    from('scripts') {
-//        into 'bin'
-//        exclude 'database'
-//        fileMode = 0550
-//    }
-//    from('src/main/resources') {
-//        fileType CONFIG | NOREPLACE
-//                into 'conf'
-//    }
-//    from('home') {
-//        // Creating directory entries (or not) in the RPM is normally left up to redline-rpm library.
-//        // Use this to explicitly create an entry -- for setting directory fileMode on system directories.
-//        createDirectoryEntry = true
-//        fileMode = 0500
-//        into 'home'
-//    }
-//    from('endorsed') {
-//        // Will tell redline-rpm not to auto create directories, which
-//        // is sometimes necessary to avoid rpm directory conflicts
-//        addParentDirs = false
-//        into '/usr/share/tomcat/endorsed'
-//    }
-//
-//}
-//
-//buildRpm {
-//    requires('bar', '2.2', GREATER | EQUAL)
-//    requires('baz', '1.0.1', LESS)
-//    link('/etc/init.d/foo’, '/opt/foo/bin/foo.init')
-//}
-//
-//buildDeb {
-//    requires('bat', '1.0.1')
-//    link('/etc/init.d/foo', '/opt/foo/bin/foo.upstart')
-//}

buildSrc/build.gradle.kts

@@ -44,6 +44,7 @@ dependencies {
     implementation(libs.moshi.kotlin)
     implementation(libs.kotlin.mockito)
     implementation(libs.junit)
+    implementation(libs.kotlin.compose.compiler)
 //    implementation(libs.apk.parser)
 //    implementation(libs.gradle.docker.plugin)
 //    implementation(libs.korim.jvm)

buildSrc/src/main/kotlin/org/mjdev/gradle/extensions/ProjectExt.kt

@@ -25,6 +25,7 @@ import org.gradle.api.Task
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.gradle.api.plugins.ExtraPropertiesExtension
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSet.MAIN_SOURCE_SET_NAME
 import org.gradle.api.tasks.SourceSet.TEST_SOURCE_SET_NAME
@@ -34,6 +35,7 @@ import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.findByType
 import org.gradle.kotlin.dsl.the
 import org.gradle.kotlin.dsl.withType
+import org.gradle.plugin.use.PluginDependency
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -287,9 +289,16 @@ inline fun <reified T : Task> Project.registerTask(
     }
 }
 
-fun <T : Plugin<*>> Project.apply(type: KClass<T>): T = plugins.apply(type.java)
+inline fun <reified T : Plugin<Project>> Project.applyPlugin(): T =
+    plugins.apply(T::class.java)
 
-fun Project.apply(id: String): Plugin<*> = plugins.apply(id)
+fun <T:Plugin<Project>> Project.applyPlugin(type: KClass<T>): T =
+    plugins.apply(type.java)
+
+fun Project.applyPlugin(type: Provider<PluginDependency>) =
+    applyPlugin(type.get().pluginId)
+
+fun Project.applyPlugin(id: String): Plugin<*> = plugins.apply(id)
 
 inline fun <reified T : Task> Project.task(scoped: T.() -> Unit = {}): T {
     val task = tasks.withType<T>().first()

buildSrc/src/main/kotlin/org/mjdev/gradle/extensions/TaskExt.kt

@@ -18,6 +18,7 @@ import io.gitlab.arturbosch.detekt.Detekt
 import org.gradle.StartParameter
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
+import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.logging.Logger
@@ -305,8 +306,8 @@ fun Task.mustRunAfter(taskScope: () -> Task) {
     mustRunAfter(taskScope())
 }
 
-fun <T : Plugin<*>> Task.apply(type: KClass<T>): T =
-    project.apply(type)
+fun <T : Plugin<Project>> Task.apply(type: KClass<T>) =
+    project.applyPlugin(type)
 
 fun Task.kotlinCompileOptions(scoped: KotlinCompile.() -> Unit) =
     project.kotlinCompileOptions(scoped)

buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/AppPlugin.kt

@@ -14,7 +14,6 @@ import io.gitlab.arturbosch.detekt.DetektPlugin
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import org.gradle.api.Project
 import org.gradle.api.artifacts.dsl.LockMode
-import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.dokka.Platform
@@ -44,7 +43,7 @@ import org.mjdev.gradle.extensions.kotlinCompileOptions
 import org.mjdev.gradle.extensions.detektTask
 import org.mjdev.gradle.extensions.dokkaTask
 import org.mjdev.gradle.extensions.releaseNotesCreateTask
-import org.mjdev.gradle.extensions.apply
+import org.mjdev.gradle.extensions.applyPlugin
 import org.mjdev.gradle.extensions.projectName
 import org.mjdev.gradle.extensions.webServiceCreateTask
 import org.mjdev.gradle.extensions.loadRootPropertiesFile
@@ -69,20 +68,21 @@ class AppPlugin : BasePlugin() {
         val appConfig: AppConfig = extension<AppConfig>(AppConfig.configFieldName)
         fromBuildPropertiesFile(appConfig, AppConfig.configPropertiesFile)
         loadRootPropertiesFile(appConfig.versionPropertiesFile)
-        apply(plugin = "com.android.application")
-        apply(plugin = "kotlin-kapt")
-        apply(plugin = "kotlin-android")
-        apply(plugin = "kotlin-parcelize")
-        apply(plugin = "com.google.devtools.ksp")
-        apply(plugin = "com.google.dagger.hilt.android")
-        apply(plugin = "dagger.hilt.android.plugin")
-        apply(plugin = "io.objectbox")
-        apply(plugin = "org.jetbrains.dokka")
-        apply(MarkdownPlugin::class)
-        apply(DetektPlugin::class)
-        apply(KotlinterPlugin::class)
+        applyPlugin(libs.plugins.android.application)
+        applyPlugin(libs.plugins.kotlin.kapt)
+        applyPlugin(libs.plugins.kotlin.android)
+        applyPlugin(libs.plugins.kotlin.parcelize)
+        applyPlugin(libs.plugins.google.devtools.ksp)
+        applyPlugin(libs.plugins.google.dagger.hilt.android)
+        applyPlugin(libs.plugins.dagger.hilt.android)
+        applyPlugin(libs.plugins.objectbox)
+        applyPlugin(libs.plugins.gradle.dokka)
+        applyPlugin(libs.plugins.kotlin.compose.compiler)
+        applyPlugin<MarkdownPlugin>()
+        applyPlugin<DetektPlugin>()
+        applyPlugin<KotlinterPlugin>()
         registerTask<CleanProjectTask>()
-        registerTask<CheckNewLibsTask>() {
+        registerTask<CheckNewLibsTask> {
             mustRunAfter(cleanProjectTask())
         }
         registerTask<CreatePropsTask> {
@@ -109,7 +109,7 @@ class AppPlugin : BasePlugin() {
                 targetCompatibility = AppConfig.javaVersion
             }
             composeOptions {
-                kotlinCompilerExtensionVersion = AppConfig.kotlinCompilerVersion
+//                enableStrongSkippingMode = true
             }
             defaultConfig {
                 applicationId = appConfig.namespace
@@ -283,6 +283,7 @@ class AppPlugin : BasePlugin() {
                 }
             }
             kotlinCompileOptions {
+                @Suppress("DEPRECATION")
                 kotlinOptions {
                     freeCompilerArgs += "-Xjsr305=strict"
                     jvmTarget = AppConfig.javaVersion.toString()

buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/LibPlugin.kt

@@ -13,7 +13,6 @@ import io.gitlab.arturbosch.detekt.DetektPlugin
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import org.gradle.api.Project
 import org.gradle.api.artifacts.dsl.LockMode
-import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.dokka.Platform
@@ -34,12 +33,12 @@ import org.mjdev.gradle.extensions.ksp
 import org.mjdev.gradle.extensions.kotlinCompileOptions
 import org.mjdev.gradle.extensions.detektTask
 import org.mjdev.gradle.extensions.dokkaTask
-import org.mjdev.gradle.extensions.apply
 import org.mjdev.gradle.extensions.fromBuildPropertiesFile
 import org.mjdev.gradle.extensions.loadRootPropertiesFile
 import org.mjdev.gradle.extensions.projectName
 import org.mjdev.gradle.extensions.registerTask
 import org.mjdev.gradle.tasks.CreatePropsTask
+import org.mjdev.gradle.extensions.applyPlugin
 
 @Suppress("UnstableApiUsage")
 class LibPlugin : BasePlugin() {
@@ -47,17 +46,19 @@ class LibPlugin : BasePlugin() {
         val libConfig: LibConfig = extension<LibConfig>(LibConfig.configFieldName)
         fromBuildPropertiesFile(libConfig, LibConfig.configPropertiesFile)
         loadRootPropertiesFile(libConfig.versionPropertiesFile)
-        apply(plugin = "kotlin-android")
-        apply(plugin = "com.android.library")
-        apply(plugin = "kotlin-kapt")
-        apply(plugin = "kotlin-parcelize")
-        apply(plugin = "com.google.devtools.ksp")
-        apply(plugin = "com.google.dagger.hilt.android")
-        apply(plugin = "dagger.hilt.android.plugin")
-        apply(plugin = "io.objectbox")
-        apply("org.jetbrains.dokka")
-        apply(DetektPlugin::class)
-        apply(KotlinterPlugin::class)
+        applyPlugin(libs.plugins.android.library)
+        applyPlugin(libs.plugins.kotlin.kapt)
+        applyPlugin(libs.plugins.kotlin.android)
+        applyPlugin(libs.plugins.kotlin.parcelize)
+        applyPlugin(libs.plugins.google.devtools.ksp)
+        applyPlugin(libs.plugins.google.devtools.ksp)
+        applyPlugin(libs.plugins.google.dagger.hilt.android)
+        applyPlugin(libs.plugins.dagger.hilt.android)
+        applyPlugin(libs.plugins.objectbox)
+        applyPlugin(libs.plugins.gradle.dokka)
+        applyPlugin(libs.plugins.kotlin.compose.compiler)
+        applyPlugin<DetektPlugin>()
+        applyPlugin<KotlinterPlugin>()
         registerTask<CreatePropsTask> {
             propsFilePath = LibConfig.configPropertiesFile
             propsClass = LibConfig::class.java
@@ -74,7 +75,7 @@ class LibPlugin : BasePlugin() {
                 buildConfig = LibConfig.buildConfigEnabled
             }
             composeOptions {
-                kotlinCompilerExtensionVersion = LibConfig.kotlinCompilerVersion
+//                enableStrongSkippingMode = true
             }
             defaultConfig {
                 minSdk = LibConfig.minSdk
@@ -148,6 +149,7 @@ class LibPlugin : BasePlugin() {
                 }
             }
             kotlinCompileOptions {
+                @Suppress("DEPRECATION")
                 kotlinOptions {
                     freeCompilerArgs += "-Xjsr305=strict"
                     jvmTarget = LibConfig.javaVersion.toString()

buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/config/AppConfig.kt

@@ -54,7 +54,6 @@ open class AppConfig : BuildConfigs() {
         const val compileSdk = 34
         const val minSdk = 21
 
-        const val kotlinCompilerVersion = "1.5.8"
         const val jacocoVersion = "0.8.8"
 
         const val multiDexEnabled = true

buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/config/LibConfig.kt

@@ -42,7 +42,6 @@ open class LibConfig : BuildConfigs() {
         const val compileSdk = 34
         const val minSdk = 21
 
-        const val kotlinCompilerVersion = "1.5.8"
         const val jacocoVersion = "0.8.8"
 
         val javaVersion = JavaVersion.VERSION_17

config/version.app.prop

@@ -7,4 +7,4 @@
 #
 majorVersion=1
 minorVersion=3
-patchVersion=0
+patchVersion=1

gradle.properties

@@ -21,3 +21,4 @@ kotlin.mpp.applyDefaultHierarchyTemplate=false
 createReports=true
 systemProp.javax.xml.accessExternalDTD=http
 systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl
+kotlin.experimental.tryK2=true

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ android-material = "1.11.0"
 androidsvg-aar = "1.4"
 #
 androidx-activity-compose = "1.9.0"
-androidx-compose-bom = "2024.04.01"
+androidx-compose-bom = "2024.05.00"
 androidx-customview-poolingcontainer = "1.0.0"
 androidx-espresso-core = "3.5.1"
 androidx-exifinterface = "1.3.7"
@@ -28,7 +28,7 @@ androidx-work-runtime-ktx = "2.9.0"
 anrwatchdog = "1.4.0"
 apk-parser = "2.6.10"
 auth0 = "2.10.2"
-compose = "1.0.0-beta01"
+compose = "4.14.0"
 converter-moshi = "2.9.0"
 dagger = "2.50"
 dailymotion-sdk-android = "0.2.12"
@@ -36,14 +36,14 @@ dailymotion-sdk-android = "0.2.12"
 
 dependency-analysis-gradle-plugin = "0.10.0"
 detekt-formatting = "1.23.4"
-detekt-gradle-plugin = "1.23.4"
-dokka-gradle-plugin = "1.8.10"
+detekt-gradle-plugin = "1.23.6"
+dokka-gradle-plugin = "1.9.20"
 google-api-services-androidpublisher = "v3-rev41-1.25.0"
 gradle = "8.2.2"
 gradle-api = "8.2.2"
 gradle-docker-plugin = "9.4.0"
 gradleNodePlugin = "1.3.1"
-gradleOspackagePlugin = "8.4.1"
+gradleOspackagePlugin = "9.1.1"
 ini4j = "0.5.4"
 #
 javapoet = "1.13.0"
@@ -51,33 +51,30 @@ jsoup = "1.17.2"
 junit = "4.13.2"
 jwtdecode = "2.0.2"
 korim-jvm = "4.0.2"
-
-kotlin-gradle-plugin = "1.9.22"
-kotlin-reflect = "1.9.22"
-kotlin-stdlib-jdk8 = "1.9.22"
-kotlinpoet = "1.13.2"
-kotlinter-gradle = "3.16.0"
+kotlin = "2.0.0-RC3"
+kotlinpoet = "1.16.0"
+kotlinter-gradle = "4.3.0"
 kotlinx-coroutines-android = "1.8.0"
-landscapist-glide = "2.2.13"
-lottie-compose = "6.2.0"
+landscapist-glide = "2.3.3"
+lottie-compose = "6.4.0"
 #
 markdownGradlePlugin = "2.2.0"
-mockito-kotlin = "5.2.1"
-moshi = "1.15.0"
-moshi-kotlin = "1.12.0"
+mockito-kotlin = "5.3.1"
+moshi = "1.15.1"
+moshi-kotlin = "1.15.1"
 objectbox-gradle-plugin = "3.7.1"
-okhttp = "5.0.0-alpha.12"
-okhttp3-bom = "5.0.0-alpha.12"
+okhttp = "5.0.0-alpha.14"
+okhttp3-bom = "5.0.0-alpha.14"
 okhttp3-integration = "4.16.0"
-okhttp3-logging-interceptor = "5.0.0-alpha.12"
+okhttp3-logging-interceptor = "5.0.0-alpha.14"
 org-eclipse-jgit = "4.8.0.201706111038-r"
 paparazzi-gradle-plugin = "1.3.2"
 photofilter = "2.0.2"
 r8 = "8.3.37"
 retrofit2-kotlin-coroutines-adapter = "0.9.2"
-sandwich = "2.0.5"
+sandwich = "2.0.7"
 timber = "5.0.1"
-zxing-core = "3.5.2"
+zxing-core = "3.5.3"
 
 # libraries ########################################################################################
 [libraries]
@@ -162,7 +159,7 @@ gradle-api = { module = "com.android.tools.build:gradle-api", version.ref = "gra
 gradle-detekt-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt-gradle-plugin" }
 gradle-docker-plugin = { module = "com.bmuschko:gradle-docker-plugin", version.ref = "gradle-docker-plugin" }
 gradle-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka-gradle-plugin" }
-gradle-kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-gradle-plugin" }
+gradle-kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 gradle-kotlinter = { module = "org.jmailen.gradle:kotlinter-gradle", version.ref = "kotlinter-gradle" }
 gradle-markdown-plugin = { module = "org.kordamp.gradle:markdown-gradle-plugin", version.ref = "markdownGradlePlugin" }
 #gradle-node-plugin = { module = "com.moowork.gradle:gradle-node-plugin", version.ref = "gradleNodePlugin" }
@@ -176,9 +173,9 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 junit = { module = "junit:junit", version.ref = "junit" }
 korim-jvm = { module = "com.soywiz.korlibs.korim:korim-jvm", version.ref = "korim-jvm" }
 kotlin-mockito = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }
-kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-reflect" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 # kotlin
-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin-stdlib-jdk8" }
+kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 # kotlinx
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines-android" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-android" }
@@ -205,6 +202,7 @@ sandwich = { module = "com.github.skydoves:sandwich", version.ref = "sandwich" }
 sandwich-retrofit = { module = "com.github.skydoves:sandwich-retrofit", version.ref = "sandwich" }
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 zxing-core = { module = "com.google.zxing:core", version.ref = "zxing-core" }
+kotlin-compose-compiler = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
 #
 #classpath("org.jetbrains.kotlin:kotlin-scripting-jsr223:1.9.22")
 #classpath("org.jetbrains.kotlin:kotlin-scripting-common:1.9.22")
@@ -217,16 +215,24 @@ zxing-core = { module = "com.google.zxing:core", version.ref = "zxing-core" }
 
 ## plugins #########################################################################################
 [plugins]
-android-application = "com.android.application:8.3.2"
-android-kotlin = "org.jetbrains.kotlin.android:1.9.22"
-android-library = "com.android.library:8.3.2"
+android-application = "com.android.application:8.4.0"
+android-library = "com.android.library:8.4.0"
 gradle-android-dagger-hilt = "com.google.dagger.hilt.android:2.47"
 gradle-catalogs-update = "nl.littlerobots.version-catalog-update:0.8.4"
-gradle-devtools-google-ksp = "com.google.devtools.ksp:1.9.22-1.0.17"
+gradle-devtools-google-ksp = "com.google.devtools.ksp:2.0.0-RC3-1.0.20"
 gradle-ktlint = "org.jlleitschuh.gradle.ktlint:11.3.2"
 # todo ktorfit https://foso.github.io/Ktorfit/
 #gradle-ktorfit = "de.jensklingenberg.ktorfit:1.10.2"
 #gradle-markdown = "org.kordamp.gradle.markdown:2.2.0"
 #gradle-os-packages = "nebula.ospackage:9.1.1"
-gradle-versions = { id = "com.github.ben-manes.versions", version="0.41.0" }
+gradle-versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
 #gradle-node = { id ="com.moowork.node", version="1.3.1" }
+kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
+gradle-dokka = { id = "org.jetbrains.dokka" }
+objectbox = { id = "io.objectbox" }
+google-devtools-ksp = { id = "com.google.devtools.ksp" }
+google-dagger-hilt-android = { id = "com.google.dagger.hilt.android" }
+dagger-hilt-android = { id = "dagger.hilt.android.plugin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Sep 27 16:14:20 CEST 2023
+#Mon May 20 13:58:31 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

tvlib/src/main/kotlin/org/mjdev/tvlib/webscrapper/base/CustomChromeClient.kt

@@ -195,12 +195,14 @@ class CustomChromeClient(
         return super.onShowFileChooser(webView, filePathCallback, fileChooserParams)
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onConsoleMessage(message: String?, lineNumber: Int, sourceID: String?) {
         onError(JSMessage(message, lineNumber, sourceID))
         super.onConsoleMessage(message, lineNumber, sourceID)
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onExceededDatabaseQuota(
         url: String?,
@@ -221,12 +223,14 @@ class CustomChromeClient(
         )
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onJsTimeout(): Boolean {
         onError(JSTimeoutException())
         return super.onJsTimeout()
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onShowCustomView(
         view: View?,