From a524695e225c72263c7b7582e57c36057b8f6cd2 Mon Sep 17 00:00:00 2001 From: Frederick O'Brien Date: Wed, 28 Feb 2024 11:22:23 +0000 Subject: [PATCH 1/8] Recipe schema inclusive CAPI model version --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 179a4c8d..f8f80442 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,7 +2,7 @@ import sbt._ object Dependencies { val scalaVersions = Seq("2.12.19", "2.13.13") - val capiModelsVersion = "19.0.1" + val capiModelsVersion = "21.0.0-PREVIEW.agschema-org-field.2024-03-01T1602.c5a81993" val thriftVersion = "0.19.0" val commonsCodecVersion = "1.16.1" val scalaTestVersion = "3.0.9" From 6d9d4c65d4eb1b0076f2482c2b00ca5821c6c741 Mon Sep 17 00:00:00 2001 From: frederickobrien Date: Wed, 28 Feb 2024 14:28:09 +0000 Subject: [PATCH 2/8] Add show-schemaorg param Co-Authored-By: Charlotte Emms <43961396+cemms1@users.noreply.github.com> --- .../src/main/scala/com.gu.contentapi.client/model/Queries.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala b/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala index d279ab17..ddd659ae 100644 --- a/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala +++ b/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala @@ -283,6 +283,7 @@ trait ShowParameters[Owner <: Parameters[Owner]] extends Parameters[Owner] { thi def showSection = BoolParameter("show-section") def showStats = BoolParameter("show-stats") def showAliasPaths = BoolParameter("show-alias-paths") + def showSchemaOrg = BoolParameter("show-schemaorg") } trait ShowReferencesParameters[Owner <: Parameters[Owner]] extends Parameters[Owner] { this: Owner => From b7c01ecdd607c5b44acee6bfa543170d5a56ab20 Mon Sep 17 00:00:00 2001 From: frederickobrien Date: Tue, 5 Mar 2024 10:08:29 +0000 Subject: [PATCH 3/8] Update Queries.scala --- .../src/main/scala/com.gu.contentapi.client/model/Queries.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala b/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala index ddd659ae..d279ab17 100644 --- a/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala +++ b/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala @@ -283,7 +283,6 @@ trait ShowParameters[Owner <: Parameters[Owner]] extends Parameters[Owner] { thi def showSection = BoolParameter("show-section") def showStats = BoolParameter("show-stats") def showAliasPaths = BoolParameter("show-alias-paths") - def showSchemaOrg = BoolParameter("show-schemaorg") } trait ShowReferencesParameters[Owner <: Parameters[Owner]] extends Parameters[Owner] { this: Owner => From 13e279630353cdce1b968eeb2e1e94413a0e2dcb Mon Sep 17 00:00:00 2001 From: frederickobrien Date: Tue, 5 Mar 2024 10:09:55 +0000 Subject: [PATCH 4/8] Revert "Update Queries.scala" This reverts commit b7c01ecdd607c5b44acee6bfa543170d5a56ab20. --- .../src/main/scala/com.gu.contentapi.client/model/Queries.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala b/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala index d279ab17..ddd659ae 100644 --- a/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala +++ b/client/src/main/scala/com.gu.contentapi.client/model/Queries.scala @@ -283,6 +283,7 @@ trait ShowParameters[Owner <: Parameters[Owner]] extends Parameters[Owner] { thi def showSection = BoolParameter("show-section") def showStats = BoolParameter("show-stats") def showAliasPaths = BoolParameter("show-alias-paths") + def showSchemaOrg = BoolParameter("show-schemaorg") } trait ShowReferencesParameters[Owner <: Parameters[Owner]] extends Parameters[Owner] { this: Owner => From 49e32db9531d7cba224a44cdf5cb22f3f76ad04b Mon Sep 17 00:00:00 2001 From: frederickobrien Date: Tue, 5 Mar 2024 10:34:37 +0000 Subject: [PATCH 5/8] Bump preview version --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f8f80442..dddd68ca 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,7 +2,7 @@ import sbt._ object Dependencies { val scalaVersions = Seq("2.12.19", "2.13.13") - val capiModelsVersion = "21.0.0-PREVIEW.agschema-org-field.2024-03-01T1602.c5a81993" + val capiModelsVersion = "21.0.0-PREVIEW.agschema-org-field.2024-03-05T1018.a555b63a" val thriftVersion = "0.19.0" val commonsCodecVersion = "1.16.1" val scalaTestVersion = "3.0.9" From fc329ef78be8f0726a5e1a7548f9426777497c2d Mon Sep 17 00:00:00 2001 From: frederickobrien Date: Tue, 5 Mar 2024 12:24:17 +0000 Subject: [PATCH 6/8] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4ee469d0..dc7c7ff0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: jobs: release: - uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@main + uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@log-github-output permissions: { contents: write, pull-requests: write } secrets: SONATYPE_PASSWORD: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_PASSWORD }} From b1e96a45a7d8383802f18542dedbb413d22d94e8 Mon Sep 17 00:00:00 2001 From: frederickobrien Date: Tue, 5 Mar 2024 15:07:35 +0000 Subject: [PATCH 7/8] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dc7c7ff0..4ee469d0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: jobs: release: - uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@log-github-output + uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@main permissions: { contents: write, pull-requests: write } secrets: SONATYPE_PASSWORD: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_PASSWORD }} From 26b500a70ddafc4032ec6a99ff9685200b3d5ac3 Mon Sep 17 00:00:00 2001 From: frederickobrien Date: Tue, 12 Mar 2024 15:47:58 +0000 Subject: [PATCH 8/8] Point at latest CAPI models version --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index dddd68ca..79cca421 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,7 +2,7 @@ import sbt._ object Dependencies { val scalaVersions = Seq("2.12.19", "2.13.13") - val capiModelsVersion = "21.0.0-PREVIEW.agschema-org-field.2024-03-05T1018.a555b63a" + val capiModelsVersion = "21.0.0" val thriftVersion = "0.19.0" val commonsCodecVersion = "1.16.1" val scalaTestVersion = "3.0.9"