Test with release build & update proguard config. (#8156)

.github/workflows/build.yml

@@ -450,6 +450,7 @@ jobs:
         api-level:
           - 21
           - 29
+          - 34
 
     steps:
       - name: Checkout
@@ -488,6 +489,7 @@ jobs:
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
+          arch: ${{ matrix.api-level == '34' && 'x86_64' || 'x86' }}
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: false
@@ -497,10 +499,20 @@ jobs:
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
+          arch: ${{ matrix.api-level == '34' && 'x86_64' || 'x86' }}
           script: ./gradlew -PandroidBuild=true :okhttp-android:connectedCheck :android-test:connectedCheck
         env:
           API_LEVEL: ${{ matrix.api-level }}
 
+      - name: Run Release Tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: ${{ matrix.api-level == '34' && 'x86_64' || 'x86' }}
+          script: ./gradlew -PandroidBuild=true :android-test-app:connectedCheck
+        env:
+          API_LEVEL: ${{ matrix.api-level }}
+
   testloom:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'loom')

android-test-app/build.gradle.kts

@@ -0,0 +1,51 @@
+@file:Suppress("UnstableApiUsage")
+
+plugins {
+  id("com.android.application")
+  id("kotlin-android")
+}
+
+android {
+  compileSdk = 34
+
+  namespace = "okhttp.android.testapp"
+
+  testBuildType = "release"
+
+  defaultConfig {
+    minSdk = 21
+    targetSdk = 34
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
+
+  compileOptions {
+    targetCompatibility(JavaVersion.VERSION_11)
+    sourceCompatibility(JavaVersion.VERSION_11)
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.toString()
+  }
+
+  buildTypes {
+    release {
+      isShrinkResources = true
+      isMinifyEnabled = true
+      signingConfig = signingConfigs.getByName("debug")
+      setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"))
+      testProguardFiles("test-proguard-rules.pro")
+    }
+  }
+}
+
+dependencies {
+  implementation(libs.playservices.safetynet)
+  implementation(projects.okhttp)
+  implementation(projects.okhttpAndroid)
+  implementation(libs.androidx.activity)
+
+  androidTestImplementation(libs.androidx.junit)
+  androidTestImplementation(libs.androidx.espresso.core)
+  androidTestImplementation(libs.androidx.test.runner)
+  androidTestImplementation(libs.assertk)
+}

android-test-app/proguard-rules.pro

@@ -0,0 +1 @@
+# no rules should be needed

android-test-app/src/androidTest/kotlin/okhttp/android/testapp/PublicSuffixDatabaseTest.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2023 Block, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package okhttp3.android
+
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.junit.Test
+
+/**
+ * Run with "./gradlew :android-test-app:connectedCheck -PandroidBuild=true" and make sure ANDROID_SDK_ROOT is set.
+ */
+class PublicSuffixDatabaseTest {
+
+  @Test
+  fun testTopLevelDomain() {
+    assertThat("https://www.google.com/robots.txt".toHttpUrl().topPrivateDomain()).isEqualTo("google.com")
+  }
+}

android-test-app/src/main/AndroidManifest.xml

@@ -0,0 +1,23 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools" package="okhttp.android.testapp">
+
+  <uses-permission android:name="android.permission.INTERNET" />
+
+  <application
+    android:allowBackup="true"
+    android:label="@string/app_name"
+    android:supportsRtl="true"
+    android:name=".TestApplication"
+  >
+    <activity
+      android:name=".MainActivity"
+      android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+
+</manifest>

android-test-app/src/main/kotlin/okhttp/android/testapp/MainActivity.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2023 Block, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package okhttp.android.testapp
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.CookieJar
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.internal.publicsuffix.PublicSuffixDatabase
+import okio.FileSystem
+import okio.IOException
+import okio.Path.Companion.toPath
+import java.net.CookieHandler
+import java.net.URI
+
+class MainActivity : ComponentActivity() {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    val client = OkHttpClient()
+
+    val url = "https://github.com/square/okhttp".toHttpUrl()
+    println(url.topPrivateDomain())
+
+    client.newCall(Request(url)).enqueue(object : Callback {
+      override fun onFailure(call: Call, e: IOException) {
+        println("failed: $e")
+      }
+
+      override fun onResponse(call: Call, response: Response) {
+        println("response: ${response.code}")
+        response.close()
+      }
+    })
+  }
+}

android-test-app/src/main/kotlin/okhttp/android/testapp/TestApplication.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2023 Block, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package okhttp.android.testapp
+
+import android.app.Application
+
+class TestApplication: Application() {
+}

android-test-app/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+  <string name="app_name">android-test</string>
+</resources>

android-test-app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+  <base-config cleartextTrafficPermitted="false">
+  </base-config>
+</network-security-config>

android-test-app/test-proguard-rules.pro

@@ -0,0 +1 @@
+-dontwarn **

build.gradle.kts

@@ -72,6 +72,7 @@ subprojects {
   if (project.name == "okhttp-android") return@subprojects
   if (project.name == "android-test") return@subprojects
   if (project.name == "regression-test") return@subprojects
+  if (project.name == "android-test-app") return@subprojects
 
   apply(plugin = "checkstyle")
   apply(plugin = "ru.vyarus.animalsniffer")

gradle.properties

@@ -9,4 +9,4 @@ kotlin.incremental.js.ir=true
 androidBuild=false
 graalBuild=false
 loomBuild=false
-android.experimental.lint.version=8.1.0-rc01
+android.experimental.lint.version=8.2.0

gradle/libs.versions.toml

@@ -14,6 +14,7 @@ org-junit-jupiter = "5.10.1"
 
 [libraries]
 amazonCorretto = "software.amazon.cryptools:AmazonCorrettoCryptoProvider:2.3.1"
+androidx-activity = "androidx.activity:activity-ktx:1.8.2"
 androidx-annotation = "androidx.annotation:annotation:1.7.1"
 androidx-espresso-core = "androidx.test.espresso:espresso-core:3.5.1"
 androidx-junit = "androidx.test.ext:junit:1.1.5"
@@ -33,7 +34,7 @@ conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref =
 conscrypt-openjdk = { module = "org.conscrypt:conscrypt-openjdk-uber", version.ref = "org-conscrypt" }
 eclipseOsgi = "org.eclipse.platform:org.eclipse.osgi:3.18.500"
 findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
-gradlePlugin-android = "com.android.tools.build:gradle:8.0.2"
+gradlePlugin-android = "com.android.tools.build:gradle:8.2.0"
 gradlePlugin-androidJunit5 = "de.mannodermaus.gradle.plugins:android-junit5:1.10.0.0"
 gradlePlugin-animalsniffer = "ru.vyarus:gradle-animalsniffer-plugin:1.7.1"
 gradlePlugin-binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.13.2"

okhttp-testing-support/src/main/resources/META-INF/proguard/okhttp3.pro

@@ -0,0 +1,2 @@
+# OkHttp test platform rules uses optional classes.
+-dontwarn **

okhttp/src/main/resources/META-INF/proguard/okhttp3.pro

@@ -2,6 +2,7 @@
 -dontwarn javax.annotation.**
 
 # A resource is loaded with a relative path so the package of this class must be preserved.
+-keeppackagenames okhttp3.internal.publicsuffix.*
 -adaptresourcefilenames okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz
 
 # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.

regression-test/build.gradle.kts

@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-  compileSdk = 31
+  compileSdk = 34
 
   namespace = "okhttp.android.regression"
 
   defaultConfig {
     minSdk = 21
-    targetSdk = 31
+    targetSdk = 34
 
     // Make sure to use the AndroidJUnitRunner (or a sub-class) in order to hook in the JUnit 5 Test Builder
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

settings.gradle.kts

@@ -49,6 +49,7 @@ project(":okhttp-logging-interceptor").name = "logging-interceptor"
 if (!isKnownBrokenIntelliJ()) {
   include(":okhttp-android")
   include(":android-test")
+  include(":android-test-app")
 }
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")