diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index dadeb54..7008ef4 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -52,7 +52,7 @@ jobs:
uses: actions/create-release@v1
id: create_release
with:
- release_name: ${{ steps.version.outputs.version }}
+ release_name: ${{ steps.read-properties.outputs.projectVersion }}
tag_name: ${{ steps.read-properties.outputs.projectVersion }}
body: "Release ${{ steps.read-properties.outputs.projectVersion }}"
env:
diff --git a/.github/workflows/publish_ios.yml b/.github/workflows/publish_ios.yml
deleted file mode 100644
index d2a11da..0000000
--- a/.github/workflows/publish_ios.yml
+++ /dev/null
@@ -1,205 +0,0 @@
-name: Create release and upload iOS artifacts
-
-on:
- push:
- branches: [ "release" ]
-
-jobs:
- build:
- runs-on: macos-latest
-
- permissions:
- contents: write
- id-token: write
-
- env:
- SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
- SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-
- steps:
-
- - name: "Checkout sources"
- uses: actions/checkout@v4
-
- - name: "Setup Java"
- uses: actions/setup-java@v4
- with:
- java-version: '17'
- distribution: 'adopt'
-
- - name: "Build xcframework"
- run: ./gradlew assembleXCFramework
-
- - name: release
- uses: actions/create-release@v1
- id: create_release
- with:
- release_name: ${{ steps.version.outputs.version }}
- tag_name: ${{ github.ref }}
- body: "Release ${{ github.ref }}"
- env:
- GITHUB_TOKEN: ${{ github.token }}
-
- - name: "Release data:"
- run: echo id ${{steps.create_release.outputs.id}} html_url ${{steps.create_release.outputs.html_url}} upload_url ${{steps.create_release.outputs.upload_url}}
-
- - name: "Prepare xcframework artifacts for collab module"
- run: bash ${GITHUB_WORKSPACE}/gradle/pack_xcframework.sh collab ${{steps.create_release.outputs.html_url}}
-
- - name: "Prepare xcframework artifacts for history module"
- run: bash ${GITHUB_WORKSPACE}/gradle/pack_xcframework.sh history ${{steps.create_release.outputs.html_url}}
-
- - name: "Prepare xcframework artifacts for model module"
- run: bash ${GITHUB_WORKSPACE}/gradle/pack_xcframework.sh model ${{steps.create_release.outputs.html_url}}
-
- - name: "Prepare xcframework artifacts for state module"
- run: bash ${GITHUB_WORKSPACE}/gradle/pack_xcframework.sh state ${{steps.create_release.outputs.html_url}}
-
- - name: "Prepare xcframework artifacts for test-builder module"
- run: bash ${GITHUB_WORKSPACE}/gradle/pack_xcframework.sh test-builder ${{steps.create_release.outputs.html_url}}
-
- - name: "Prepare xcframework artifacts for transform module"
- run: bash ${GITHUB_WORKSPACE}/gradle/pack_xcframework.sh transform ${{steps.create_release.outputs.html_url}}
-
- - name: "Prepare xcframework artifacts for util module"
- run: bash ${GITHUB_WORKSPACE}/gradle/pack_xcframework.sh util ${{steps.create_release.outputs.html_url}}
-
- - name: upload xcframework artifacts for collab module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./collab/build/collab.xcframework.zip
- asset_name: collab.xcframework.zip
- asset_content_type: application/zip
-
- - name: upload Package.swift artifacts for collab module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./collab/build/Package.swift
- asset_name: collab.package.swift
- asset_content_type: text/plain
-
- - name: upload xcframework artifacts for history module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./history/build/history.xcframework.zip
- asset_name: history.xcframework.zip
- asset_content_type: application/zip
-
- - name: upload Package.swift artifacts for history module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./history/build/Package.swift
- asset_name: history.package.swift
- asset_content_type: text/plain
-
- - name: upload xcframework artifacts for model module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./model/build/model.xcframework.zip
- asset_name: model.xcframework.zip
- asset_content_type: application/zip
-
- - name: upload Package.swift artifacts for model module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./model/build/Package.swift
- asset_name: model.package.swift
- asset_content_type: text/plain
-
- - name: upload xcframework artifacts for state module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./state/build/state.xcframework.zip
- asset_name: state.xcframework.zip
- asset_content_type: application/zip
-
- - name: upload Package.swift artifacts for state module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./state/build/Package.swift
- asset_name: state.package.swift
- asset_content_type: text/plain
-
- - name: upload xcframework artifacts for test-builder module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./test-builder/build/test_builder.xcframework.zip
- asset_name: test-builder.xcframework.zip
- asset_content_type: application/zip
-
- - name: upload Package.swift artifacts for test-builder module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./test-builder/build/Package.swift
- asset_name: test-builder.package.swift
- asset_content_type: text/plain
-
- - name: upload xcframework artifacts for transform module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./transform/build/transform.xcframework.zip
- asset_name: transform.xcframework.zip
- asset_content_type: application/zip
-
- - name: upload Package.swift artifacts for transform module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./transform/build/Package.swift
- asset_name: transform.package.swift
- asset_content_type: text/plain
-
- - name: upload xcframework artifacts for util module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./util/build/util.xcframework.zip
- asset_name: util.xcframework.zip
- asset_content_type: application/zip
-
- - name: upload Package.swift artifacts for util module
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./util/build/Package.swift
- asset_name: util.package.swift
- asset_content_type: text/plain
diff --git a/model/config/ktlint/baseline.xml b/model/config/ktlint/baseline.xml
index f177809..21a9070 100644
--- a/model/config/ktlint/baseline.xml
+++ b/model/config/ktlint/baseline.xml
@@ -465,7 +465,7 @@
-
+
@@ -475,66 +475,66 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/model/src/commonMain/kotlin/com/atlassian/prosemirror/model/Schema.kt b/model/src/commonMain/kotlin/com/atlassian/prosemirror/model/Schema.kt
index 20ded3e..190d825 100644
--- a/model/src/commonMain/kotlin/com/atlassian/prosemirror/model/Schema.kt
+++ b/model/src/commonMain/kotlin/com/atlassian/prosemirror/model/Schema.kt
@@ -370,7 +370,7 @@ class Attribute(
get() = !this.hasDefault
init {
- this.hasDefault = options.default != null //Object.prototype.hasOwnProperty.call(options, "default")
+ this.hasDefault = options.hasDefault //Object.prototype.hasOwnProperty.call(options, "default")
this.default = options.default
this.validate = options.validateString?.let { validateType(typeName, attrName, it) }
@@ -638,6 +638,7 @@ interface AttributeSpec {
// that have no default must be provided whenever a node or mark of a type that has them is
// created.
val default: Any?
+ val hasDefault: Boolean
// A function or type name used to validate values of this
// attribute. This will be used when deserializing the attribute
// from JSON, and when running [`Node.check`](#model.Node.check).
diff --git a/test-builder/src/commonMain/kotlin/com/atlassian/prosemirror/testbuilder/AdfSchema.kt b/test-builder/src/commonMain/kotlin/com/atlassian/prosemirror/testbuilder/AdfSchema.kt
index f49bd39..d5a760d 100644
--- a/test-builder/src/commonMain/kotlin/com/atlassian/prosemirror/testbuilder/AdfSchema.kt
+++ b/test-builder/src/commonMain/kotlin/com/atlassian/prosemirror/testbuilder/AdfSchema.kt
@@ -45,8 +45,10 @@ data class MarkSpecImpl(
data class AttributeSpecImpl(
override val default: Any?,
+ override val hasDefault: Boolean,
override val validateString: String? = null,
override val validateFunction: ((value: Any?) -> Unit)? = null
) : AttributeSpec {
- constructor() : this(null)
+ constructor(default: Any?, validateString: String? = null) : this(default, true, validateString)
+ constructor() : this(null, false)
}
diff --git a/version.properties b/version.properties
index 37f9215..90c1ae3 100644
--- a/version.properties
+++ b/version.properties
@@ -1 +1 @@
-projectVersion=1.1.2
+projectVersion=1.1.3