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

Move golden images from submodule #423

Merged
merged 2 commits into from
Mar 3, 2023
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class AndroidXLayoutlibImplPlugin : Plugin<Project> {
*/
private fun Test.configureTestTask(paparazziNative: FileCollection) {
val platformDirectory = project.getSdkPath().resolve("platforms/$COMPILE_SDK_VERSION")
val goldenRootDirectory = project.getSupportRootFolder().resolve("../../golden")
val goldenRootDirectory = project.getSupportRootFolder().resolve("golden")
val modulePath = project.path.replace(':', '/').trim('/')
val android = project.the<BaseExtension>()
val packageName = requireNotNull(android.namespace) {
Expand Down
2 changes: 1 addition & 1 deletion compose/foundation/foundation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
// Screenshot tests related setup
android {
sourceSets.androidTest.assets.srcDirs +=
project.rootDir.absolutePath + "/../../golden/compose/foundation/foundation"
project.rootDir.absolutePath + "/golden/compose/foundation/foundation"
namespace "androidx.compose.foundation"
}

Expand Down
2 changes: 1 addition & 1 deletion compose/material/material/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,6 @@ androidx {
// Screenshot tests related setup
android {
sourceSets.androidTest.assets.srcDirs +=
project.rootDir.absolutePath + "/../../golden/compose/material/material"
project.rootDir.absolutePath + "/golden/compose/material/material"
namespace "androidx.compose.material"
}
2 changes: 1 addition & 1 deletion compose/material3/material3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ androidx {
// Screenshot tests related setup
android {
sourceSets.androidTest.assets.srcDirs +=
project.rootDir.absolutePath + "/../../golden/compose/material3/material3"
project.rootDir.absolutePath + "/golden/compose/material3/material3"
namespace "androidx.compose.material3"
}

Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui-graphics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ android {

if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
tasks.findByName("desktopTest").configure {
systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/../../golden"
systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/golden"
}
}

Expand Down
4 changes: 2 additions & 2 deletions compose/ui/ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ androidx {

if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
tasks.findByName("desktopTest").configure {
systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/../../golden"
systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/golden"
}
}

Expand All @@ -311,7 +311,7 @@ android {
// Screenshot tests related setup
android {
sourceSets.androidTest.assets.srcDirs +=
project.rootDir.absolutePath + "/../../golden/compose/ui/ui"
project.rootDir.absolutePath + "/golden/compose/ui/ui"
namespace "androidx.compose.ui"
}

Expand Down
2 changes: 1 addition & 1 deletion glance/glance-appwidget/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ android {
resourcePrefix "glance_"

sourceSets {
androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/glance/glance-appwidget"
androidTest.assets.srcDirs += project.rootDir.absolutePath + "/golden/glance/glance-appwidget"
}

buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion glance/glance-wear-tiles/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ android {
}

sourceSets {
androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/glance/glance-wear-tiles"
androidTest.assets.srcDirs += project.rootDir.absolutePath + "/golden/glance/glance-wear-tiles"
}
namespace "androidx.glance.wear.tiles"

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading