Various updates and modernizations

.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

.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/[email protected]
+        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

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:8.5.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 {

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 = 33
+        minSdk = 17
+        targetSdk = 33
         versionCode = 170030003
         versionName = "3.0.3"
         base.archivesBaseName = "$applicationId-$versionName"
@@ -54,8 +55,6 @@ android {
     }
 
     kotlinOptions.jvmTarget = "1.8"
-
-    sourceSets.forEach { it.java.srcDir("src/${it.name}/kotlin") }
 }
 
 dependencies {

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>
+</manifest>

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() {

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
      */

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 = 33
+        minSdk = 16
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
-        named("release") {
+        release {
             isMinifyEnabled = true
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
@@ -61,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")
 }
 
@@ -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"))
@@ -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")
         }
     }
 }