From 37ad97c76123d468e89da6570da05445f9bd6037 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Mon, 28 Nov 2022 19:03:43 +0000 Subject: [PATCH] using screen-state submodule --- .gitmodules | 3 +++ build.gradle | 6 ------ screen-state | 1 + settings.gradle | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 .gitmodules create mode 160000 screen-state diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..74b800c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "screen-state"] + path = screen-state + url = git@github.com:ouchadam/screen-state.git diff --git a/build.gradle b/build.gradle index e1c1e9b..944d6f1 100644 --- a/build.gradle +++ b/build.gradle @@ -151,12 +151,6 @@ ext.androidImportFixturesWorkaround = { project, fixtures -> project.dependencies.testImplementation fixtures.files("build/libs/${fixtures.name}.jar") } -ext.androidImportCompositeFixturesWorkaround = { project, fixtures -> - project.dependencies.testImplementation(project.dependencies.testFixtures(fixtures)) - project.dependencies.testImplementation fixtures.files("build/libs/${fixtures.name}-test-fixtures.jar") - project.dependencies.testImplementation fixtures.files("build/libs/${fixtures.name}.jar") -} - ext.isFoss = { return rootProject.hasProperty("foss") } diff --git a/screen-state b/screen-state new file mode 160000 index 0000000..4e92f14 --- /dev/null +++ b/screen-state @@ -0,0 +1 @@ +Subproject commit 4e92f14031cc8be907cba09b3bfc1d9dbd380072 diff --git a/settings.gradle b/settings.gradle index f677ed5..d24e38e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,7 +7,7 @@ dependencyResolutionManagement { } rootProject.name = "SmallTalk" -includeBuild '../screen-state' +includeBuild 'screen-state' include ':app'