Merge branch 'main' into rjr-add-new-caption-field-to-capi-model

Author: RikRootsGuardian

build.sbt

@@ -5,7 +5,7 @@ import sbtversionpolicy.withsbtrelease.ReleaseVersion
 
 // dependency versions
 val contentEntityVersion = "4.0.0"
-val contentAtomVersion = "9.0.0"
+val contentAtomVersion = "10.0.0"
 val storyPackageVersion = "2.2.0"
 val thriftVersion = "0.15.0"
 val scroogeVersion = "22.1.0" // update plugins too if this version changes

models/src/main/thrift/content/v1.thrift

@@ -299,7 +299,7 @@ struct AssetFields {
 
   12: optional string name
 
-  13: optional string secureFile
+  13: optional string secureFile // see also 71: secureFileWithAds
 
   14: optional bool isMaster
 
@@ -415,6 +415,8 @@ struct AssetFields {
   69: optional bool isMandatory
 
   70: optional list<CartoonVariant> cartoonVariants
+
+  71: optional string secureFileWithAds
 }
 
 struct Asset {

project/plugins.sbt

@@ -3,6 +3,6 @@ addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.5")
 
 addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "22.1.0")
-addSbtPlugin("com.gu" % "sbt-scrooge-typescript" % "1.6.0")
+addSbtPlugin("com.gu" % "sbt-scrooge-typescript" % "4.0.0")
 
 addDependencyTreePlugin

version.sbt

@@ -1 +1 @@
-ThisBuild / version := "37.0.1-SNAPSHOT"
+ThisBuild / version := "38.0.1-SNAPSHOT"