Add test for dexing patch

gradle-plugin/src/test/fixtures/buildscript.gradle

@@ -4,7 +4,8 @@ project.buildscript.repositories {
 }
 
 project.buildscript.dependencies {
-  classpath 'app.cash.better.dynamic.features:app.cash.better.dynamic.features.gradle.plugin:+'
+  classpath 'app.cash.better.dynamic.features:agp-patch:+'
+  classpath 'app.cash.better.dynamic.features:gradle-plugin:+'
   classpath libs.kotlin.gradle
   classpath libs.agp
   classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${libs.versions.ksp.get()}"

gradle-plugin/src/test/fixtures/missing-dex/base/build.gradle

@@ -0,0 +1,22 @@
+apply plugin: 'com.android.application'
+apply plugin: 'org.jetbrains.kotlin.android'
+apply plugin: 'com.google.devtools.ksp'
+apply plugin: 'app.cash.better.dynamic.features'
+apply plugin: 'app.cash.better.dynamic.features.agp-patch'
+
+android {
+  namespace "app.cash.better.dynamic.features.integration"
+
+  compileSdk 32
+  defaultConfig {
+    minSdk = 24
+
+    versionCode 1
+  }
+
+  dynamicFeatures = [':feature']
+}
+
+dependencies {
+  implementation "com.squareup.okhttp3:okhttp:4.9.3"
+}

gradle-plugin/src/test/fixtures/missing-dex/base/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest />

gradle-plugin/src/test/fixtures/missing-dex/build.gradle

@@ -0,0 +1,13 @@
+buildscript {
+  apply from: "${projectDir.absolutePath}/../buildscript.gradle"
+}
+
+allprojects {
+  repositories {
+    maven {
+      url "file://${rootDir}/../../../../build/localMaven"
+    }
+    mavenCentral()
+    google()
+  }
+}

gradle-plugin/src/test/fixtures/missing-dex/feature/build.gradle

@@ -0,0 +1,18 @@
+apply plugin: 'com.android.dynamic-feature'
+apply plugin: 'org.jetbrains.kotlin.android'
+apply plugin: 'com.google.devtools.ksp'
+apply plugin: 'app.cash.better.dynamic.features'
+
+android {
+  namespace "app.cash.better.dynamic.features.integration.feature"
+
+  compileSdk 32
+  defaultConfig {
+    minSdk = 24
+  }
+}
+
+dependencies {
+  implementation project(":base")
+  implementation project(":library")
+}

gradle-plugin/src/test/fixtures/missing-dex/feature/src/main/AndroidManifest.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:dist="http://schemas.android.com/apk/distribution">
+    <dist:module
+        dist:instant="false"
+        dist:title="Feature">
+        <dist:delivery>
+            <dist:install-time />
+        </dist:delivery>
+        <dist:fusing dist:include="true" />
+    </dist:module>
+</manifest>

gradle-plugin/src/test/fixtures/missing-dex/gradle.properties

@@ -0,0 +1,2 @@
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g
+android.useAndroidX=true

gradle-plugin/src/test/fixtures/missing-dex/library/build.gradle

@@ -0,0 +1,5 @@
+apply plugin: 'org.jetbrains.kotlin.jvm'
+
+dependencies {
+  implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.2"
+}

gradle-plugin/src/test/fixtures/missing-dex/library/src/main/java/com/example/JavaClass.java

@@ -0,0 +1,7 @@
+package com.example;
+
+public class JavaClass {
+    public String message() {
+        return "Java!";
+    }
+}

gradle-plugin/src/test/fixtures/missing-dex/library/src/main/kotlin/com/example/KotlinClass.kt

@@ -0,0 +1,5 @@
+package com.example
+
+class KotlinClass {
+  fun message() = "Kotlin!"
+}

gradle-plugin/src/test/fixtures/missing-dex/settings.gradle

@@ -0,0 +1,5 @@
+apply from: "../settings.gradle"
+
+include ':base'
+include ':feature'
+include ':library'

gradle-plugin/src/test/fixtures/settings.gradle

@@ -9,7 +9,8 @@ dependencyResolutionManagement {
 
 includeBuild('../../../../../') {
   dependencySubstitution {
-    substitute module("app.cash.better.dynamic.features:app.cash.better.dynamic.features.gradle.plugin") using project(":gradle-plugin")
+    substitute module("app.cash.better.dynamic.features:gradle-plugin") using project(":gradle-plugin")
+    substitute module("app.cash.better.dynamic.features:agp-patch") using project(":agp-patch")
     substitute module('app.cash.better.dynamic.features:codegen') using project(':codegen')
     substitute module('app.cash.better.dynamic.features:codegen-api') using project(':codegen:api')
     substitute module('app.cash.better.dynamic.features:codegen-ksp') using project(':codegen:ksp')

gradle-plugin/src/test/java/app/cash/better/dynamic/features/BetterDynamicFeaturesPluginTest.kt

@@ -16,11 +16,13 @@
 package app.cash.better.dynamic.features
 
 import app.cash.better.dynamic.features.tasks.Version
+import app.cash.better.dynamic.features.utils.assertThat
 import com.google.common.truth.Truth.assertThat
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Test
 import java.io.File
+import kotlin.io.path.bufferedReader
 
 class BetterDynamicFeaturesPluginTest {
   @Test fun `base and feature apks have different library versions`() {
@@ -829,6 +831,28 @@ class BetterDynamicFeaturesPluginTest {
     assertThat(high).isGreaterThan(low)
   }
 
+  @Test fun `missing dex patch works correctly`() {
+    val integrationRoot = File("src/test/fixtures/missing-dex")
+
+    val gradleRunner = GradleRunner.create()
+      .withCommonConfiguration(integrationRoot)
+      .withArguments(":base:packageDebugUniversalApk", "--stacktrace")
+
+    gradleRunner.build()
+
+    val dexContent = dexdump(integrationRoot.resolve("base/build/outputs/apk_from_bundle/debug/base-debug-universal.apk"))
+    assertThat(dexContent.bufferedReader().lineSequence()).containsInConsecutiveOrder(
+      """  Class descriptor  : 'Lcom/example/JavaClass;'""",
+      """  Access flags      : 0x0001 (PUBLIC)""",
+      """  Superclass        : 'Ljava/lang/Object;'""",
+    )
+    assertThat(dexContent.bufferedReader().lineSequence()).containsInConsecutiveOrder(
+      """  Class descriptor  : 'Lcom/example/KotlinClass;'""",
+      """  Access flags      : 0x0011 (PUBLIC FINAL)""",
+      """  Superclass        : 'Ljava/lang/Object;'""",
+    )
+  }
+
   private fun clearLockfile(root: File) {
     root.lockfile().takeIf { it.exists() }?.delete()
   }