Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Compose version to latest stable 1.2.0 #249

Merged
merged 1 commit into from
Aug 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.KSP_VERSION = '1.6.10-1.0.4'
ext.KSP_VERSION = '1.7.0-1.0.6'

ext.versions = [
'androidXTestCore':'1.4.0',
'androidXTestRules':'1.4.0',
'assertJ': '3.16.1',
'compose': '1.1.1',
'composeActivity': '1.4.0',
'composeConstraintLayout': '1.0.0',
'composeNavigation': '2.4.1',
'compose': '1.2.0',
'composeActivity': '1.5.0',
'composeConstraintLayout': '1.0.1',
'composeNavigation': '2.5.1',
'detekt': '1.7.4',
'espresso': '3.2.0',
'gradle': '7.0.3',
'gradle': '7.2.1',
'junit' : '4.13',
'junitImplementation' : '1.1.2',
'kotlin': '1.6.10',
'kotlinCompilerVersion': '1.6.10',
'kotlinCompileTesting': '1.4.7',
'kotlinPoet': '1.10.2',
'kotlinXMetadata': '0.4.0',
'kotlin': '1.7.0',
'kotlinCompilerVersion': '1.7.0',
'kotlinCompileTesting': '1.4.9',
'kotlinPoet': '1.12.0',
'kotlinXMetadata': '0.5.0',
'ksp': "$KSP_VERSION",
'ktx': '1.1.0',
'lifecycle':'2.2.0',
Expand All @@ -30,7 +30,7 @@ buildscript {
'material':'1.4.0',
'mdcComposeThemeAdapter':'1.0.2',
'strikt':'0.33.0',
'xprocessing':'2.4.2',
'xprocessing':'2.4.3',
'corektx':'1.7.0',
'shot': '5.13.0'
]
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
4 changes: 2 additions & 2 deletions sample-submodule/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ if (project.hasProperty('useKsp')) {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 32

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
4 changes: 2 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ if (project.hasProperty('useKsp')) {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
applicationId "com.airbnb.android.showkasesample"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 32
versionCode 1
versionName "1.0"
testInstrumentationRunner "com.karumi.shot.ShotTestRunner"
Expand Down
3 changes: 2 additions & 1 deletion sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
<activity
android:name="com.airbnb.android.showkasesample.MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.App.NoActionBar">
android:theme="@style/Theme.App.NoActionBar"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
2 changes: 1 addition & 1 deletion showkase-annotation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}
// Maven artifact publish
dependencies {
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.19.0'
}
}

Expand Down
4 changes: 2 additions & 2 deletions showkase-browser-testing-submodule/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (project.hasProperty('useKsp')) {
}

android {
compileSdkVersion 31
compileSdkVersion 32
// Added to avoid this error -
// Execution failed for task ':showkase-processor-testing:mergeDebugAndroidTestJavaResource'.
// > A failure occurred while executing com.android.build.gradle.internal.tasks.Workers$ActionFacade
Expand All @@ -22,7 +22,7 @@ android {
}
defaultConfig {
minSdkVersion 26
targetSdkVersion 30
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// The following argument makes the Android Test Orchestrator run its
// "pm clear" command after each test invocation. This command ensures
Expand Down
4 changes: 2 additions & 2 deletions showkase-browser-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (project.hasProperty('useKsp')) {
}

android {
compileSdkVersion 31
compileSdkVersion 32
// Added to avoid this error -
// Execution failed for task ':showkase-processor-testing:mergeDebugAndroidTestJavaResource'.
// > A failure occurred while executing com.android.build.gradle.internal.tasks.Workers$ActionFacade
Expand All @@ -22,7 +22,7 @@ android {
}
defaultConfig {
minSdkVersion 26
targetSdkVersion 30
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// The following argument makes the Android Test Orchestrator run its
// "pm clear" command after each test invocation. This command ensures
Expand Down
4 changes: 2 additions & 2 deletions showkase-processor-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 31
compileSdkVersion 32
// Added to avoid this error -
// Execution failed for task ':showkase-processor-testing:mergeDebugAndroidTestJavaResource'.
// > A failure occurred while executing com.android.build.gradle.internal.tasks.Workers$ActionFacade
Expand All @@ -19,7 +19,7 @@ android {
}
defaultConfig {
minSdkVersion 26
targetSdkVersion 30
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// The following argument makes the Android Test Orchestrator run its
// "pm clear" command after each test invocation. This command ensures
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
insideWrapperClass = false,
showkaseKDoc = "",
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun group1name1(): Unit {
}
Expand All @@ -30,7 +30,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
insideWrapperClass = false,
showkaseKDoc = "",
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun group2name2(): Unit {
}
Expand All @@ -44,7 +44,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
insideObject = false,
insideWrapperClass = false,
showkaseKDoc = "",
showkaseMetadataType = "COLOR"
showkaseMetadataType = "COLOR",
)
public fun colorname(): Unit {
}
Expand All @@ -58,7 +58,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
insideObject = false,
insideWrapperClass = false,
showkaseKDoc = "",
showkaseMetadataType = "TYPOGRAPHY"
showkaseMetadataType = "TYPOGRAPHY",
)
public fun typographyname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import kotlin.collections.List
numComposablesWithoutPreviewParameter = 2,
numComposablesWithPreviewParameter = 0,
numColors = 1,
numTypography = 1
numTypography = 1,
)
public class TestShowkaseRootCodegen : ShowkaseProvider {
public val componentList: List<ShowkaseBrowserComponent> =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseKDoc = "",
enclosingClass = [WrapperClass::class],
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun WrapperClassTestComposable1(): Unit {
}
Expand All @@ -35,7 +35,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false,
previewParameterClass = [ParameterProvider::class],
previewParameterName = "text"
previewParameterName = "text",
)
public fun DefaultGroupTestComposable2(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import kotlin.collections.List
numComposablesWithoutPreviewParameter = 1,
numComposablesWithPreviewParameter = 1,
numColors = 0,
numTypography = 0
numTypography = 0,
)
public class TestShowkaseRootCodegen : ShowkaseProvider {
public val componentList: List<ShowkaseBrowserComponent> =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
insideWrapperClass = true,
showkaseKDoc = "",
enclosingClass = [WrapperClass::class],
showkaseMetadataType = "COLOR"
showkaseMetadataType = "COLOR",
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import kotlin.collections.List
numComposablesWithoutPreviewParameter = 0,
numComposablesWithPreviewParameter = 0,
numColors = 1,
numTypography = 0
numTypography = 0,
)
public class TestShowkaseRootCodegen : ShowkaseProvider {
public val componentList: List<ShowkaseBrowserComponent> =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
insideWrapperClass = true,
showkaseKDoc = "",
enclosingClass = [WrapperClass::class],
showkaseMetadataType = "COLOR"
showkaseMetadataType = "COLOR",
)
public fun WrapperClassname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import kotlin.collections.List
numComposablesWithoutPreviewParameter = 0,
numComposablesWithPreviewParameter = 0,
numColors = 1,
numTypography = 0
numTypography = 0,
)
public class TestShowkaseRootCodegen : ShowkaseProvider {
public val componentList: List<ShowkaseBrowserComponent> =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
insideWrapperClass = false,
showkaseKDoc = "",
enclosingClass = [ShowkaseObject::class],
showkaseMetadataType = "COLOR"
showkaseMetadataType = "COLOR",
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
insideWrapperClass = false,
showkaseKDoc = "",
enclosingClass = [WrapperClass::class],
showkaseMetadataType = "COLOR"
showkaseMetadataType = "COLOR",
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import kotlin.collections.List
numComposablesWithoutPreviewParameter = 0,
numComposablesWithPreviewParameter = 0,
numColors = 1,
numTypography = 0
numTypography = 0,
)
public class TestShowkaseRootCodegen : ShowkaseProvider {
public val componentList: List<ShowkaseBrowserComponent> =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
insideWrapperClass = true,
showkaseKDoc = "",
enclosingClass = [Composables::class],
showkaseMetadataType = "COLOR"
showkaseMetadataType = "COLOR",
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseKDoc = "",
enclosingClass = [WrapperClass::class],
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import kotlin.collections.List
numComposablesWithoutPreviewParameter = 1,
numComposablesWithPreviewParameter = 0,
numColors = 0,
numTypography = 0
numTypography = 0,
)
public class TestShowkaseRootCodegen : ShowkaseProvider {
public val componentList: List<ShowkaseBrowserComponent> =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseKDoc = "",
enclosingClass = [ShowkaseClass::class],
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseKDoc = "",
enclosingClass = [WrapperClass::class],
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseKDoc = "",
enclosingClass = [WrapperClass::class],
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import kotlin.collections.List
numComposablesWithoutPreviewParameter = 1,
numComposablesWithPreviewParameter = 0,
numColors = 0,
numTypography = 0
numTypography = 0,
)
public class TestShowkaseRootCodegen : ShowkaseProvider {
public val componentList: List<ShowkaseBrowserComponent> =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseKDoc = "",
enclosingClass = [ShowkaseClass::class],
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseKDoc = "",
enclosingClass = [WrapperClass::class],
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseKDoc = "",
enclosingClass = [ShowkaseObject::class],
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseKDoc = "",
enclosingClass = [WrapperObject::class],
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun groupname(): Unit {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ShowkaseMetadata_com_airbnb_android_showkase_processor_testing {
showkaseKDoc = "",
enclosingClass = [WrapperClass::class],
showkaseMetadataType = "COMPONENT",
isDefaultStyle = false
isDefaultStyle = false,
)
public fun groupname(): Unit {
}
Expand Down
Loading