-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge `main` into `release` branch for release v1.1.1 This was done by: 1. Initiating a merge 2. On merge conflicts, copy all files from `main` branch into my current directory 3. Commit Context: - `release` branch was previously updated by cherrypicking off `main`. When I tried to merge `main` into `release`, it resulted in the whole repo being in conflict. - MK is currently using prosemirror 1.0.2, so we cannot delete the `release` branch and start again. --------- Co-authored-by: Doug Marques <[email protected]> Co-authored-by: Douglas Marques <[email protected]> Co-authored-by: Aleksei Chernykh <[email protected]> Co-authored-by: Aleksei Chernykh <[email protected]> Co-authored-by: doug-atlassian <[email protected]> Co-authored-by: Edward Zhang <[email protected]>
- Loading branch information
1 parent
dc62d1e
commit 47b1fcf
Showing
151 changed files
with
5,106 additions
and
3,765 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
--- | ||
name: Bug report | ||
about: Create a report to help us improve | ||
title: '' | ||
labels: '' | ||
assignees: '' | ||
|
||
--- | ||
|
||
**Describe the bug** | ||
A clear and concise description of what the bug is. | ||
|
||
**To Reproduce** | ||
Steps to reproduce the behavior: | ||
1. Go to '...' | ||
2. Click on '....' | ||
3. Scroll down to '....' | ||
4. See error | ||
|
||
**Expected behavior** | ||
A clear and concise description of what you expected to happen. | ||
|
||
**Screenshots** | ||
If applicable, add screenshots to help explain your problem. | ||
|
||
**Desktop (please complete the following information):** | ||
- OS: [e.g. iOS] | ||
- Browser [e.g. chrome, safari] | ||
- Version [e.g. 22] | ||
|
||
**Smartphone (please complete the following information):** | ||
- Device: [e.g. iPhone6] | ||
- OS: [e.g. iOS8.1] | ||
- Browser [e.g. stock browser, safari] | ||
- Version [e.g. 22] | ||
|
||
**Additional context** | ||
Add any other context about the problem here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- | ||
name: Feature request | ||
about: Suggest an idea for this project | ||
title: '' | ||
labels: '' | ||
assignees: '' | ||
|
||
--- | ||
|
||
**Is your feature request related to a problem? Please describe.** | ||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] | ||
|
||
**Describe the solution you'd like** | ||
A clear and concise description of what you want to happen. | ||
|
||
**Describe alternatives you've considered** | ||
A clear and concise description of any alternative solutions or features you've considered. | ||
|
||
**Additional context** | ||
Add any other context or screenshots about the feature request here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,205 @@ | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# Security Policy | ||
|
||
## Supported Versions | ||
|
||
| Version | Supported | | ||
| ------- | ------------------ | | ||
| 1.0.0 | :x: | | ||
| > 1.0.0 | :white_check_mark: | | ||
|
||
## Reporting a Vulnerability | ||
|
||
Please report Vulnerability on the issues section. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,3 @@ | ||
This module implements an API into which a communication channel for | ||
collaborative editing can be hooked. See | ||
[the guide](/docs/guide/#collab) for more details and an example. | ||
|
||
## Maven / Gradle dependency | ||
|
||
Check the latest package at Maven central on: https://packages.atlassian.com/maven-central/com/atlassian/prosemirror/collab. | ||
|
||
### Maven: | ||
```xml | ||
<dependency> | ||
<groupId>com.atlassian.prosemirror</groupId> | ||
<artifactId>collab</artifactId> | ||
<version>1.0.2</version> | ||
</dependency> | ||
``` | ||
|
||
### Gradle: | ||
```kotlin | ||
implementation("com.atlassian.prosemirror:collab:1.0.2") | ||
``` |
Oops, something went wrong.