From 7a386696b6887527507e361c0b66cf082fe97c81 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <sascha@peilicke.de>
Date: Thu, 12 Sep 2024 12:12:23 +0200
Subject: [PATCH 1/6] Adopt IntelliJ 2024.3 project configuration

---
 .idea/codeStyles/Project.xml       |  9 +++++++++
 .idea/deploymentTargetSelector.xml | 10 ++++++++++
 .idea/kotlinc.xml                  |  6 +++---
 .idea/runConfigurations.xml        | 12 ------------
 4 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 .idea/deploymentTargetSelector.xml
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3a342f4..3367caf 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -27,6 +27,9 @@
         <emptyLine />
       </value>
     </option>
+    <AndroidXmlCodeStyleSettings>
+      <option name="USE_CUSTOM_SETTINGS" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
@@ -59,7 +62,13 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <XML>
+      <option name="XML_KEEP_LINE_BREAKS" value="false" />
+      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
+      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </XML>
     <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..be1627a
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="customtabs-example">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index ae8a337..059e602 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Kotlin2JsCompilerArguments">
-    <option name="sourceMapEmbedSources" />
-  </component>
   <component name="Kotlin2JvmCompilerArguments">
     <option name="jvmTarget" value="1.8" />
   </component>
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.7.22" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file

From 5593c7a3e2404c917b394d129742feb0cf12ae5b Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <sascha@peilicke.de>
Date: Thu, 12 Sep 2024 14:45:05 +0200
Subject: [PATCH 2/6] Update Gradle and Kotlin dependencies; adjust Android
 config

Upgraded Gradle to 7.5 and Kotlin to 1.6.20 for better compatibility and
performance. Added `namespace` to the android block and marked main
activities as exported in manifest files to comply with recent Android
changes. Adjusted `compileSdkVersion` placement and set the version
explicitly in `MavenPublication`.
---
 .idea/vcs.xml                                   |  3 +++
 build.gradle.kts                                |  4 ++--
 customtabs-example/build.gradle.kts             |  7 ++++---
 customtabs-example/src/main/AndroidManifest.xml |  6 +++---
 customtabs/build.gradle.kts                     | 10 +++++-----
 customtabs/src/main/AndroidManifest.xml         |  7 ++++---
 gradle/wrapper/gradle-wrapper.properties        |  2 +-
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 78cface..aa0b347 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,10 @@
 <project version="4">
   <component name="CommitMessageInspectionProfile">
     <profile version="1.0">
+      <inspection_tool class="BodyLimit" enabled="true" level="WARNING" enabled_by_default="true" />
       <inspection_tool class="GrazieCommit" enabled="true" level="TYPO" enabled_by_default="true" />
+      <inspection_tool class="SubjectBodySeparation" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="SubjectLimit" enabled="true" level="WARNING" enabled_by_default="true" />
     </profile>
   </component>
   <component name="VcsDirectoryMappings">
diff --git a/build.gradle.kts b/build.gradle.kts
index 7cbac8a..00067f4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,14 +19,14 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.1.1")
+        classpath("com.android.tools.build:gradle:7.4.2")
     }
 }
 
 plugins {
     id("com.diffplug.spotless") version "5.12.4"
     id("com.github.ben-manes.versions") version "0.38.0"
-    kotlin("jvm") version "1.5.0"
+    kotlin("jvm") version "1.6.20"
 }
 
 repositories {
diff --git a/customtabs-example/build.gradle.kts b/customtabs-example/build.gradle.kts
index a9396c7..a6c0285 100644
--- a/customtabs-example/build.gradle.kts
+++ b/customtabs-example/build.gradle.kts
@@ -26,12 +26,13 @@ repositories {
 }
 
 android {
-    compileSdkVersion(29)
+    namespace = "com.example.saschpe.customtabs"
 
     defaultConfig {
         applicationId = "com.example.saschpe.customtabs"
-        minSdkVersion(17)
-        targetSdkVersion(29)
+        compileSdk = 31
+        minSdk = 17
+        targetSdk = 31
         versionCode = 170030003
         versionName = "3.0.3"
         base.archivesBaseName = "$applicationId-$versionName"
diff --git a/customtabs-example/src/main/AndroidManifest.xml b/customtabs-example/src/main/AndroidManifest.xml
index d226442..e3bc9d3 100644
--- a/customtabs-example/src/main/AndroidManifest.xml
+++ b/customtabs-example/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
   ~ limitations under the License.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.saschpe.customtabs">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".Application"
@@ -29,6 +28,7 @@
 
         <activity
             android:name=".activity.MainActivity"
+            android:exported="true"
             android:theme="@style/AppTheme.NoActionBar">
 
             <intent-filter>
@@ -40,4 +40,4 @@
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/customtabs/build.gradle.kts b/customtabs/build.gradle.kts
index a932a71..b767da5 100644
--- a/customtabs/build.gradle.kts
+++ b/customtabs/build.gradle.kts
@@ -28,17 +28,16 @@ repositories {
 }
 
 android {
-    compileSdkVersion(29)
+    namespace = "saschpe.android.customtabs"
 
     defaultConfig {
-        minSdkVersion(16)
-        targetSdkVersion(29)
-        versionName = "3.0.3"
+        compileSdk = 31
+        minSdk = 16
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
-        named("release") {
+        release {
             isMinifyEnabled = true
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
@@ -85,6 +84,7 @@ publishing {
     publications {
         register<MavenPublication>("mavenAndroid") {
             artifactId = "android-customtabs"
+            version = "3.0.3"
 
             afterEvaluate { artifact(tasks.getByName("bundleReleaseAar")) }
             artifact(tasks.getByName("javadocJar"))
diff --git a/customtabs/src/main/AndroidManifest.xml b/customtabs/src/main/AndroidManifest.xml
index 1b50fd0..fb1766b 100644
--- a/customtabs/src/main/AndroidManifest.xml
+++ b/customtabs/src/main/AndroidManifest.xml
@@ -13,14 +13,15 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="saschpe.android.customtabs">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application>
 
-        <activity android:name=".WebViewActivity" />
+        <activity
+            android:name=".WebViewActivity"
+            android:exported="true" />
 
         <meta-data
             android:name="android.webkit.WebView.MetricsOptOut"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d435ce2..2ec77e5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 0fc7324f1c80938a28d2328b1ba4a76d83fe1bc0 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <sascha@peilicke.de>
Date: Thu, 12 Sep 2024 15:10:28 +0200
Subject: [PATCH 3/6] Update build configurations and dependencies

Upgraded bytecode target level, Gradle version, and Kotlin version.
Improved comments and cleaned up unnecessary source set configuration.
Enhanced error handling and documentation in CustomTabs helper classes.
---
 .idea/compiler.xml                                |  2 +-
 .idea/deploymentTargetSelector.xml                |  3 +++
 .idea/kotlinc.xml                                 |  2 +-
 build.gradle.kts                                  |  2 +-
 customtabs-example/build.gradle.kts               |  2 --
 .../com/example/saschpe/customtabs/Application.kt |  2 +-
 .../saschpe/customtabs/activity/MainActivity.kt   |  4 ++--
 customtabs/build.gradle.kts                       |  2 +-
 .../android/customtabs/CustomTabsHelper.kt        | 10 +++++-----
 .../android/customtabs/CustomTabsPackageHelper.kt |  6 +++---
 .../saschpe/android/customtabs/WebViewActivity.kt |  2 +-
 gradle.properties                                 | 15 +++++++--------
 gradle/wrapper/gradle-wrapper.properties          |  2 +-
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 79910da..4d4e5be 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,7 +11,7 @@
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel target="11">
+    <bytecodeTargetLevel target="17">
       <module name="Android.android-customtabs" target="11" />
     </bytecodeTargetLevel>
   </component>
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index be1627a..56b23e6 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -5,6 +5,9 @@
       <SelectionState runConfigName="customtabs-example">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
+      <SelectionState runConfigName="example">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 059e602..8491b65 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="1.8" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.22" />
+    <option name="version" value="1.9.22" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 00067f4..c5deb02 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("com.android.tools.build:gradle:8.5.2")
     }
 }
 
diff --git a/customtabs-example/build.gradle.kts b/customtabs-example/build.gradle.kts
index a6c0285..8b53c6a 100644
--- a/customtabs-example/build.gradle.kts
+++ b/customtabs-example/build.gradle.kts
@@ -55,8 +55,6 @@ android {
     }
 
     kotlinOptions.jvmTarget = "1.8"
-
-    sourceSets.forEach { it.java.srcDir("src/${it.name}/kotlin") }
 }
 
 dependencies {
diff --git a/customtabs-example/src/main/kotlin/com/example/saschpe/customtabs/Application.kt b/customtabs-example/src/main/kotlin/com/example/saschpe/customtabs/Application.kt
index fbf63b6..24c0861 100644
--- a/customtabs-example/src/main/kotlin/com/example/saschpe/customtabs/Application.kt
+++ b/customtabs-example/src/main/kotlin/com/example/saschpe/customtabs/Application.kt
@@ -20,7 +20,7 @@ import androidx.appcompat.app.AppCompatDelegate
 import saschpe.android.customtabs.CustomTabsActivityLifecycleCallbacks
 
 /**
- * Optional pre-loading for improved performance
+ * Optional preloading for improved performance
  */
 class Application : android.app.Application() {
     override fun onCreate() {
diff --git a/customtabs-example/src/main/kotlin/com/example/saschpe/customtabs/activity/MainActivity.kt b/customtabs-example/src/main/kotlin/com/example/saschpe/customtabs/activity/MainActivity.kt
index 5780e7f..c9a8195 100644
--- a/customtabs-example/src/main/kotlin/com/example/saschpe/customtabs/activity/MainActivity.kt
+++ b/customtabs-example/src/main/kotlin/com/example/saschpe/customtabs/activity/MainActivity.kt
@@ -35,7 +35,7 @@ import saschpe.android.customtabs.WebViewFallback
 
 class MainActivity : AppCompatActivity() {
     /**
-     * Apply some sane defaults across a single app.
+     * Apply some sensible defaults across a single app.
      * Not strictly necessary but simplifies code when having many different
      * custom tab intents in one app.
      *
@@ -62,7 +62,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     /**
-     * Start GitHub project custom tab
+     * Start a GitHub project custom tab
      *
      * See https://developer.chrome.com/multidevice/android/customtabs
      */
diff --git a/customtabs/build.gradle.kts b/customtabs/build.gradle.kts
index b767da5..9aef963 100644
--- a/customtabs/build.gradle.kts
+++ b/customtabs/build.gradle.kts
@@ -60,7 +60,7 @@ dependencies {
 
     testImplementation("androidx.test:core:1.3.0")
     testImplementation("androidx.test.ext:junit:1.1.2")
-    testImplementation("org.robolectric:robolectric:4.5.1")
+    testImplementation("org.robolectric:robolectric:4.7.1")
     testImplementation("org.mockito:mockito-core:3.9.0")
 }
 
diff --git a/customtabs/src/main/java/saschpe/android/customtabs/CustomTabsHelper.kt b/customtabs/src/main/java/saschpe/android/customtabs/CustomTabsHelper.kt
index 20ebce8..854a765 100644
--- a/customtabs/src/main/java/saschpe/android/customtabs/CustomTabsHelper.kt
+++ b/customtabs/src/main/java/saschpe/android/customtabs/CustomTabsHelper.kt
@@ -43,7 +43,7 @@ class CustomTabsHelper {
         connection?.let {
             try {
                 activity.unbindService(it)
-            } catch (e: IllegalArgumentException) {
+            } catch (_: IllegalArgumentException) {
             }
             client = null
             customTabsSession = null
@@ -145,10 +145,10 @@ class CustomTabsHelper {
             "android.support.customtabs.extra.KEEP_ALIVE"
 
         /**
-         * Opens the URL on a Custom Tab if possible. Otherwise fallsback to opening it on a WebView
+         * Opens the URL on a Custom Tab if possible. Otherwise, falls back to opening it on a WebView
          *
          * @param context The host activity
-         * @param customTabsIntent a CustomTabsIntent to be used if Custom Tabs is available
+         * @param customTabsIntent customTabsIntent to be used if Custom Tabs is available
          * @param uri the Uri to be opened
          * @param fallback a CustomTabFallback to be used if Custom Tabs is not available
          */
@@ -159,8 +159,8 @@ class CustomTabsHelper {
             fallback: CustomTabFallback?
         ) {
             val packageName = getPackageNameToUse(context)
-            // If we cant find a package name, it means there's no browser that supports
-            // Chrome Custom Tabs installed. So, we fallback to the web-view
+            // If we can't find a package name, it means there's no browser that supports Chrome Custom Tabs installed.
+            // So, we fall back to the web-view
             if (packageName == null) {
                 fallback?.openUri(context, uri)
             } else {
diff --git a/customtabs/src/main/java/saschpe/android/customtabs/CustomTabsPackageHelper.kt b/customtabs/src/main/java/saschpe/android/customtabs/CustomTabsPackageHelper.kt
index ef931cb..f8eef4f 100644
--- a/customtabs/src/main/java/saschpe/android/customtabs/CustomTabsPackageHelper.kt
+++ b/customtabs/src/main/java/saschpe/android/customtabs/CustomTabsPackageHelper.kt
@@ -36,13 +36,13 @@ internal object CustomTabsPackageHelper {
 
     /**
      * Goes through all apps that handle VIEW intents and have a warmup service. Picks
-     * the one chosen by the user if there is one, otherwise makes a best effort to return a
+     * the one chosen by the user if there is one, otherwise makes the best effort to return a
      * valid package name.
      *
      * This is **not** threadsafe.
      *
      * @param context [Context] to use for accessing [PackageManager].
-     * @return The package name recommended to use for connecting to custom tabs related components.
+     * @return The package name recommended for connecting to custom tabs related components.
      */
     @JvmStatic
     fun getPackageNameToUse(context: Context): String? {
@@ -52,7 +52,7 @@ internal object CustomTabsPackageHelper {
         val pm = context.packageManager
 
         // Get default VIEW intent handler.
-        val activityIntent = Intent(Intent.ACTION_VIEW, Uri.parse("http://www.example.com"))
+        val activityIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://www.example.com"))
         val defaultHandlerInfo = pm.resolveActivity(activityIntent, 0)
         val defaultHandlerPackageName: String? = defaultHandlerInfo?.activityInfo?.packageName
 
diff --git a/customtabs/src/main/java/saschpe/android/customtabs/WebViewActivity.kt b/customtabs/src/main/java/saschpe/android/customtabs/WebViewActivity.kt
index 91827ae..de155e7 100644
--- a/customtabs/src/main/java/saschpe/android/customtabs/WebViewActivity.kt
+++ b/customtabs/src/main/java/saschpe/android/customtabs/WebViewActivity.kt
@@ -45,7 +45,7 @@ class WebViewActivity : AppCompatActivity(R.layout.activity_webview) {
         url?.let { webView.loadUrl(it) }
         webView.settings.javaScriptEnabled = true
 
-        // No title provided. Use the website's once it's loaded...
+        // No title provided. Use the website once it's loaded...
         if (title == null) {
             webView.webViewClient = object : WebViewClient() {
                 override fun onPageFinished(view: WebView, url: String) {
diff --git a/gradle.properties b/gradle.properties
index 72997cf..9b6b556 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,13 @@
-# Project-wide Gradle settings.
-org.gradle.configureondemand=true
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-org.gradle.parallel=true
+# Gradle
+file.encoding=utf-8
 org.gradle.caching=true
+org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.parallel=true
 
 # Kotlin
 kotlin.code.style=official
-# https://blog.jetbrains.com/kotlin/2019/01/kotlin-1-3-20-released
-kotlin.parallel.tasks.in.project=true
 
-# AndroidX
+# Android
 android.useAndroidX=true
-android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2ec77e5..d951fac 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From cfb3829a0ccd9f4cba1e9f5435ced458ad1b428c Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <sascha@peilicke.de>
Date: Thu, 12 Sep 2024 15:22:54 +0200
Subject: [PATCH 4/6] Update compile and target SDK versions to 33

This change upgrades the compileSdk and targetSdk versions from 31 to
33. It ensures compatibility with the latest Android features and
security updates.
---
 customtabs-example/build.gradle.kts | 4 ++--
 customtabs/build.gradle.kts         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/customtabs-example/build.gradle.kts b/customtabs-example/build.gradle.kts
index 8b53c6a..8803015 100644
--- a/customtabs-example/build.gradle.kts
+++ b/customtabs-example/build.gradle.kts
@@ -30,9 +30,9 @@ android {
 
     defaultConfig {
         applicationId = "com.example.saschpe.customtabs"
-        compileSdk = 31
+        compileSdk = 33
         minSdk = 17
-        targetSdk = 31
+        targetSdk = 33
         versionCode = 170030003
         versionName = "3.0.3"
         base.archivesBaseName = "$applicationId-$versionName"
diff --git a/customtabs/build.gradle.kts b/customtabs/build.gradle.kts
index 9aef963..795b3a0 100644
--- a/customtabs/build.gradle.kts
+++ b/customtabs/build.gradle.kts
@@ -31,7 +31,7 @@ android {
     namespace = "saschpe.android.customtabs"
 
     defaultConfig {
-        compileSdk = 31
+        compileSdk = 33
         minSdk = 16
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

From c7842c766772d9bcbcbaa40f0d5ec9f5cc4e14d4 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <sascha@peilicke.de>
Date: Thu, 12 Sep 2024 15:34:53 +0200
Subject: [PATCH 5/6] Remove hardcoded secrets and improve CI configuration

Replaced hardcoded secrets access with dynamic property checks to
enhance security. Deleted unnecessary scripts and configurations for
handling secrets, streamlining the build process.
---
 buildSrc/build.gradle.kts               |  32 ----------
 buildSrc/src/main/kotlin/Secrets.kt.enc | Bin 176 -> 0 bytes
 customtabs/build.gradle.kts             |  16 ++---
 scripts/secret                          |  75 ------------------------
 4 files changed, 9 insertions(+), 114 deletions(-)
 delete mode 100644 buildSrc/build.gradle.kts
 delete mode 100644 buildSrc/src/main/kotlin/Secrets.kt.enc
 delete mode 100755 scripts/secret

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
deleted file mode 100644
index a738906..0000000
--- a/buildSrc/build.gradle.kts
+++ /dev/null
@@ -1,32 +0,0 @@
-plugins {
-    `kotlin-dsl`
-}
-
-repositories {
-    mavenCentral()
-}
-
-tasks {
-    val ensureSecretsExist by registering {
-        val secretFile = File("$projectDir/src/main/kotlin/Secrets.kt")
-        description = "Ensures that '$secretFile' exists"
-
-        outputs.file(secretFile)
-        doFirst {
-            if (!secretFile.exists()) {
-                secretFile.writeText(
-                    """
-object Secrets {
-    object Sonatype {
-        const val user = ""
-        const val apiKey = ""
-    }
-}
-
-""".trimIndent()
-                )
-            }
-        }
-    }
-    named("assemble") { dependsOn(ensureSecretsExist) }
-}
diff --git a/buildSrc/src/main/kotlin/Secrets.kt.enc b/buildSrc/src/main/kotlin/Secrets.kt.enc
deleted file mode 100644
index ccc3df3391a467d55c4092133e8c902c6c0f88b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 176
zcmV;h08jr@VQh3|WM5zDzfy~pBvjWswl>dk=JexmPwYrF)9eqX__0Zi&#iK3oX$sm
zP=M~@FDu%`AlNc8F=Yo4`xY6>RmT!gZ!twKI=5?ss8AZoIRYAL$T;GSEO)3w29|CH
zVIX{PXN)+kY9%~X8*!CbKSPJ4LrUZT%$>aAS_{5`J*r;{<qtPH6im``RnA_t3|N@+
exI(s6SUl(OLCl|2x#FO^iLtEbkJgUQ^QHTRxm2J4

diff --git a/customtabs/build.gradle.kts b/customtabs/build.gradle.kts
index 795b3a0..20c00ad 100644
--- a/customtabs/build.gradle.kts
+++ b/customtabs/build.gradle.kts
@@ -139,14 +139,16 @@ publishing {
         }
     }
 
-    repositories {
-        maven {
-            name = "sonatype"
-            credentials {
-                username = Secrets.Sonatype.user
-                password = Secrets.Sonatype.apiKey
+    if (hasProperty("sonatypeUser") && hasProperty("sonatypePass")) {
+        repositories {
+            maven {
+                name = "sonatype"
+                credentials {
+                    username = property("sonatypeUser") as String
+                    password = property("sonatypePass") as String
+                }
+                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2")
             }
-            url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2")
         }
     }
 }
diff --git a/scripts/secret b/scripts/secret
deleted file mode 100755
index 5b76bc5..0000000
--- a/scripts/secret
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-#
-# Script to encrypt / decrypt secrets.
-#
-
-SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-. "${SCRIPT_DIR}/inc.functions.sh"
-
-# Constants
-SECRET_FILES=(
-    buildSrc/src/main/kotlin/Secrets.kt
-)
-
-# Functions
-function usage {
-    echo -e "Usage: ${0} [COMMAND]"
-    echo -e "Options:"
-    echo -e "  --password PASSWORD"
-    echo -e "Commands:"
-    echo -e "  decrypt"
-    echo -e "  encrypt"
-    exit 1
-}
-
-# Command-line arguments
-openssl_password_option=
-openssl_command=
-while [[ $# -gt 0 ]] ; do
-    key="$1"
-    case ${key} in
-    decrypt)
-        openssl_command=decrypt
-        ;;
-    encrypt)
-        openssl_command=encrypt
-        ;;
-    -p|--password)
-        openssl_password_option="-k $2"
-        shift # past argument
-        ;;
-    -h|--help)
-        usage
-        ;;
-    *)
-        warn "Unknown option: ${key}"
-        usage
-        ;;
-    esac
-    shift # past argument or value
-done
-
-# Checks
-[[ -n "${openssl_command}" ]] || usage
-
-# Let's roll
-case ${openssl_command} in
-    decrypt)
-        for file in "${SECRET_FILES[@]}" ; do
-            approve "Decrypting ${file}.enc"
-            safe openssl enc ${openssl_password_option} -d -aes-256-cbc \
-                -in ${file}.enc -out ${file} -md sha256
-            if [[ "$(file -b ${file})" = "data" ]] ; then
-                rm -f ${file}
-                die "Failed to decrypt ${file}"
-            fi
-        done
-        ;;
-    encrypt)
-        for file in "${SECRET_FILES[@]}" ; do
-            approve "Encrypting ${file}"
-            safe openssl enc ${openssl_password_option} -aes-256-cbc -salt \
-                -in ${file} -out ${file}.enc -md sha256
-        done
-        ;;
-esac

From 4e44b9abb989d421a0763ecfc22d612c4a42c0e0 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <sascha@peilicke.de>
Date: Thu, 12 Sep 2024 15:30:47 +0200
Subject: [PATCH 6/6] Consolidate CI workflows and update JDK version

Removed existing Gradle build and validation workflows, replacing them
with a new unified CI configuration. Updated JDK version to 21 and added
a security workflow utilizing MobSF scan and GitHub CodeQL.
---
 .github/workflows/gradle-build.yml            | 24 --------------
 .../workflows/gradle-wrapper-validation.yml   | 10 ------
 .github/workflows/main.yml                    | 33 +++++++++++++++++++
 .github/workflows/security.yml                | 33 +++++++++++++++++++
 4 files changed, 66 insertions(+), 34 deletions(-)
 delete mode 100644 .github/workflows/gradle-build.yml
 delete mode 100644 .github/workflows/gradle-wrapper-validation.yml
 create mode 100644 .github/workflows/main.yml
 create mode 100644 .github/workflows/security.yml

diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
deleted file mode 100644
index 0774821..0000000
--- a/.github/workflows/gradle-build.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Gradle Build
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-        with:
-          lfs: true
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Setup Android problem matchers
-        uses: jonasb/android-problem-matchers-action@v1
-      - name: Build with Gradle
-        run: ./gradlew build
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
deleted file mode 100644
index f552c8d..0000000
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: "Validate Gradle Wrapper"
-on: [push]
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..15cf15f
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,33 @@
+name: Main CI
+on: [ push ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  spotless:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+      - name: Run Spotless
+        run: ./gradlew spotlessCheck
+
+  build:
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+      - name: Setup Android problem matchers
+        uses: jonasb/android-problem-matchers-action@v1
+      - name: Build with Gradle
+        run: ./gradlew build
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
new file mode 100644
index 0000000..111942e
--- /dev/null
+++ b/.github/workflows/security.yml
@@ -0,0 +1,33 @@
+name: Security
+on: [push]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  mobfs:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Run mobsfscan
+        uses: MobSF/mobsfscan@0.3.4
+        with:
+          args: . --sarif --output results.sarif || true
+      - name: Upload mobsfscan report
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: results.sarif
+
+  gradle-validate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v1
\ No newline at end of file