Upgrade compose version to match compiler version (#353)

* Also upgrade compose version to match compiler version

* Also upgrade compileSdkVersion to 33

* Fix another build failure

* Same build error

* Fix failing tests

* Fix lint failure

* Upgrade to Java 17

* More changes to fix build errors

.github/workflows/android.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v1
         with:
           path: ~/.gradle/caches
@@ -31,10 +31,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Checkout Branch
         uses: actions/checkout@v2
       - uses: actions/cache@v1
@@ -71,10 +71,10 @@ jobs:
         target: [ default, google_apis ]
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Checkout Branch
         uses: actions/checkout@v2
       - uses: actions/cache@v1

build.gradle

@@ -5,14 +5,14 @@ buildscript {
             'androidXTestCore'       : '1.4.0',
             'androidXTestRules'      : '1.4.0',
             'assertJ'                : '3.16.1',
-            'compose'                : '1.2.1',
+            'compose'                : '1.4.2',
             'composeCompiler'        : '1.4.2',
             'composeActivity'        : '1.5.1',
             'composeConstraintLayout': '1.0.1',
             'composeNavigation'      : '2.5.1',
             'detekt'                 : '1.7.4',
             'espresso'               : '3.2.0',
-            'gradle'                 : '7.4.0',
+            'gradle'                 : '8.0.0',
             'junit'                  : '4.13.2',
             'junitImplementation'    : '1.1.2',
             'kotlin'                 : '1.8.10',
@@ -35,7 +35,7 @@ buildscript {
             'strikt'                 : '0.33.0',
             'xprocessing'            : '2.6.0-alpha01',
             'corektx'                : '1.7.0',
-            'shot'                   : '5.13.0'
+            'shot'                   : '6.0.0'
     ]
     ext.deps = [
             'compose'                : [

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Aug 07 16:12:58 PDT 2020
+#Tue Sep 19 07:58:34 PDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip

sample-submodule-2/build.gradle

@@ -16,11 +16,12 @@ if (project.hasProperty('useKsp')) {
 }
 
 android {
-    compileSdkVersion 32
+    namespace "com.airbnb.android.submodule.showkasesample"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 32
+        compileSdk 33
+        targetSdkVersion 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -32,11 +33,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

sample-submodule-2/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.airbnb.android.second.submodule">
+<manifest>
 
 </manifest>

sample-submodule/build.gradle

@@ -17,11 +17,12 @@ if (project.hasProperty('useKsp')) {
 }
 
 android {
-    compileSdkVersion 32
+    namespace "com.airbnb.android.submodule.showkasesample"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 32
+        compileSdk 33
+        targetSdkVersion 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -33,11 +34,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

sample-submodule/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.airbnb.android.submodule">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

sample/build.gradle

@@ -19,12 +19,13 @@ if (project.hasProperty('useKsp')) {
 }
 
 android {
-    compileSdkVersion 32
+    namespace "com.airbnb.android.showkasesample"
 
     defaultConfig {
         applicationId "com.airbnb.android.showkasesample"
         minSdkVersion 21
-        targetSdkVersion 32
+        compileSdk 33
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "com.karumi.shot.ShotTestRunner"
@@ -38,11 +39,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true

sample/screenshots/debug/screenshots-compose-default/metadata_compose.json_emulator-5556

@@ -0,0 +1 @@
+{"screenshots":[{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_0"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_1"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_2"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_3"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_4"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_5"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_6"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_7"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_8"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_9"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_10"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_11"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_12"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_10"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_11"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_12"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_13"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_14"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_15"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_16"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_17","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_17"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_18","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_18"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_19","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"composable_screenshot_test_19"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_0"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_1"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_2"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_3"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_4"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_5"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_6"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_7","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"color_screenshot_test_7"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_0"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_1"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_2"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_3"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_4","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_4"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_5"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_6"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_7"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_8"},{"name":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9","testClassName":"com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen","testName":"typography_screenshot_test_9"}]}