Skip to content

Commit 469e14d

Browse files
authored
Bump Compose version to latest stable 1.2.0 (#249)
1 parent 868b0d5 commit 469e14d

122 files changed

Lines changed: 161 additions & 157 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.KSP_VERSION = '1.6.10-1.0.4'
3+
ext.KSP_VERSION = '1.7.0-1.0.6'
44

55
ext.versions = [
66
'androidXTestCore':'1.4.0',
77
'androidXTestRules':'1.4.0',
88
'assertJ': '3.16.1',
9-
'compose': '1.1.1',
10-
'composeActivity': '1.4.0',
11-
'composeConstraintLayout': '1.0.0',
12-
'composeNavigation': '2.4.1',
9+
'compose': '1.2.0',
10+
'composeActivity': '1.5.0',
11+
'composeConstraintLayout': '1.0.1',
12+
'composeNavigation': '2.5.1',
1313
'detekt': '1.7.4',
1414
'espresso': '3.2.0',
15-
'gradle': '7.0.3',
15+
'gradle': '7.2.1',
1616
'junit' : '4.13',
1717
'junitImplementation' : '1.1.2',
18-
'kotlin': '1.6.10',
19-
'kotlinCompilerVersion': '1.6.10',
20-
'kotlinCompileTesting': '1.4.7',
21-
'kotlinPoet': '1.10.2',
22-
'kotlinXMetadata': '0.4.0',
18+
'kotlin': '1.7.0',
19+
'kotlinCompilerVersion': '1.7.0',
20+
'kotlinCompileTesting': '1.4.9',
21+
'kotlinPoet': '1.12.0',
22+
'kotlinXMetadata': '0.5.0',
2323
'ksp': "$KSP_VERSION",
2424
'ktx': '1.1.0',
2525
'lifecycle':'2.2.0',
@@ -30,7 +30,7 @@ buildscript {
3030
'material':'1.4.0',
3131
'mdcComposeThemeAdapter':'1.0.2',
3232
'strikt':'0.33.0',
33-
'xprocessing':'2.4.2',
33+
'xprocessing':'2.4.3',
3434
'corektx':'1.7.0',
3535
'shot': '5.13.0'
3636
]

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

sample-submodule/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ if (project.hasProperty('useKsp')) {
1313
}
1414

1515
android {
16-
compileSdkVersion 31
16+
compileSdkVersion 32
1717

1818
defaultConfig {
1919
minSdkVersion 21
20-
targetSdkVersion 30
20+
targetSdkVersion 32
2121

2222
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2323
}

sample/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ if (project.hasProperty('useKsp')) {
1414
}
1515

1616
android {
17-
compileSdkVersion 31
17+
compileSdkVersion 32
1818

1919
defaultConfig {
2020
applicationId "com.airbnb.android.showkasesample"
2121
minSdkVersion 21
22-
targetSdkVersion 30
22+
targetSdkVersion 32
2323
versionCode 1
2424
versionName "1.0"
2525
testInstrumentationRunner "com.karumi.shot.ShotTestRunner"

sample/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<activity
2020
android:name="com.airbnb.android.showkasesample.MainActivity"
2121
android:label="@string/app_name"
22-
android:theme="@style/Theme.App.NoActionBar">
22+
android:theme="@style/Theme.App.NoActionBar"
23+
android:exported="true">
2324
<intent-filter>
2425
<action android:name="android.intent.action.MAIN" />
2526

showkase-annotation/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55
// Maven artifact publish
66
dependencies {
7-
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
7+
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.19.0'
88
}
99
}
1010

showkase-browser-testing-submodule/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if (project.hasProperty('useKsp')) {
1111
}
1212

1313
android {
14-
compileSdkVersion 31
14+
compileSdkVersion 32
1515
// Added to avoid this error -
1616
// Execution failed for task ':showkase-processor-testing:mergeDebugAndroidTestJavaResource'.
1717
// > A failure occurred while executing com.android.build.gradle.internal.tasks.Workers$ActionFacade
@@ -22,7 +22,7 @@ android {
2222
}
2323
defaultConfig {
2424
minSdkVersion 26
25-
targetSdkVersion 30
25+
targetSdkVersion 32
2626
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2727
// The following argument makes the Android Test Orchestrator run its
2828
// "pm clear" command after each test invocation. This command ensures

showkase-browser-testing/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if (project.hasProperty('useKsp')) {
1111
}
1212

1313
android {
14-
compileSdkVersion 31
14+
compileSdkVersion 32
1515
// Added to avoid this error -
1616
// Execution failed for task ':showkase-processor-testing:mergeDebugAndroidTestJavaResource'.
1717
// > A failure occurred while executing com.android.build.gradle.internal.tasks.Workers$ActionFacade
@@ -22,7 +22,7 @@ android {
2222
}
2323
defaultConfig {
2424
minSdkVersion 26
25-
targetSdkVersion 30
25+
targetSdkVersion 32
2626
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2727
// The following argument makes the Android Test Orchestrator run its
2828
// "pm clear" command after each test invocation. This command ensures

showkase-processor-testing/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 31
5+
compileSdkVersion 32
66
// Added to avoid this error -
77
// Execution failed for task ':showkase-processor-testing:mergeDebugAndroidTestJavaResource'.
88
// > A failure occurred while executing com.android.build.gradle.internal.tasks.Workers$ActionFacade
@@ -19,7 +19,7 @@ android {
1919
}
2020
defaultConfig {
2121
minSdkVersion 26
22-
targetSdkVersion 30
22+
targetSdkVersion 32
2323
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2424
// The following argument makes the Android Test Orchestrator run its
2525
// "pm clear" command after each test invocation. This command ensures

showkase-processor-testing/src/test/resources/ShowkaseProcessorTest/class_with_@ScreenshotTest_generates_screenshot_test_for_all_UI_elements/output/ShowkaseMetadata_com_airbnb_android_showkase_processor_testing.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
1515
insideWrapperClass = false,
1616
showkaseKDoc = "",
1717
showkaseMetadataType = "COMPONENT",
18-
isDefaultStyle = false
18+
isDefaultStyle = false,
1919
)
2020
public fun group1name1(): Unit {
2121
}
@@ -30,7 +30,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
3030
insideWrapperClass = false,
3131
showkaseKDoc = "",
3232
showkaseMetadataType = "COMPONENT",
33-
isDefaultStyle = false
33+
isDefaultStyle = false,
3434
)
3535
public fun group2name2(): Unit {
3636
}
@@ -44,7 +44,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
4444
insideObject = false,
4545
insideWrapperClass = false,
4646
showkaseKDoc = "",
47-
showkaseMetadataType = "COLOR"
47+
showkaseMetadataType = "COLOR",
4848
)
4949
public fun colorname(): Unit {
5050
}
@@ -58,7 +58,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
5858
insideObject = false,
5959
insideWrapperClass = false,
6060
showkaseKDoc = "",
61-
showkaseMetadataType = "TYPOGRAPHY"
61+
showkaseMetadataType = "TYPOGRAPHY",
6262
)
6363
public fun typographyname(): Unit {
6464
}

0 commit comments

Comments
 (0)