Skip to content

Commit

Permalink
Merge branch 'main' into ct/sync_migration
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/test-sync/src/commonMain/kotlin/io/realm/kotlin/test/mongodb/util/AppAdmin.kt
#	packages/test-sync/src/commonMain/kotlin/io/realm/kotlin/test/mongodb/util/AppServicesClient.kt
#	packages/test-sync/src/commonMain/kotlin/io/realm/kotlin/test/mongodb/util/SchemaProcessor.kt
#	packages/test-sync/src/commonMain/kotlin/io/realm/kotlin/test/mongodb/util/TestAppInitializer.kt
#	packages/test-sync/src/commonTest/kotlin/io/realm/kotlin/test/mongodb/common/SyncedRealmTests.kt
  • Loading branch information
clementetb committed Jul 8, 2024
2 parents 2a2f0da + 9600dd1 commit 739cfe2
Show file tree
Hide file tree
Showing 25 changed files with 776 additions and 617 deletions.
17 changes: 17 additions & 0 deletions .github/problem-matchers/detekt.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"problemMatcher": [
{
"owner": "detekt",
"severity": "error",
"pattern": [
{
"regexp": "(.+\\.kt):(\\d+):(\\d+):\\s(.*)",
"file": 1,
"line": 2,
"column": 3,
"message": 4
}
]
}
]
}
40 changes: 40 additions & 0 deletions .github/problem-matchers/kotlin.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"problemMatcher": [
{
"owner": "kotlin",
"severity": "error",
"pattern": [
{
"regexp": "^e\\:\\s(?:(?:(.*):(?:\\s\\()?(\\d+)(?:(?:\\,\\s)|\\:)(\\d+))(?:\\))?\\:\\s)?(.*)$",
"file": 1,
"line": 2,
"column": 3,
"message": 4
}
]
},
{
"owner": "kotlin-warning",
"severity": "warning",
"pattern": [
{
"regexp": "^w\\:\\s(?:(?:(.*):(?:\\s\\()?(\\d+)(?:(?:\\,\\s)|\\:)(\\d+))(?:\\))?\\:\\s)?(.*)$",
"file": 1,
"line": 2,
"column": 3,
"message": 4
}
]
},
{
"owner": "gradle-warning",
"severity": "warning",
"pattern": [
{
"regexp": "^WARNING:(.*(?:\\n(?!w|e\\:|>|FAILURE|BUILD SUCCESSFUL).*)*)$",
"message": 1
}
]
}
]
}
17 changes: 17 additions & 0 deletions .github/problem-matchers/ktlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"problemMatcher": [
{
"owner": "ktlint",
"severity": "error",
"pattern": [
{
"regexp": "(.+\\.kt):(\\d+):(\\d+):\\s(.*)",
"file": 1,
"line": 2,
"column": 3,
"message": 4
}
]
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge-branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

# Set the branch we want to merge changes into as step output. This step should list each branch name found in the `push`
# trigger in the top of this file.
Expand Down
Loading

0 comments on commit 739cfe2

Please sign in to comment.