Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/iTwin/itwinjs-core into n…
Browse files Browse the repository at this point in the history
…aron/issue7424
  • Loading branch information
naronchen committed Dec 10, 2024
2 parents 6b957f1 + 7bdb8cb commit 8176507
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 14 deletions.
10 changes: 10 additions & 0 deletions common/changes/@itwin/core-backend/2024-12-10-18-11.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-backend",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/core-backend"
}
14 changes: 5 additions & 9 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions core/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"webpack": "^5.97.1"
},
"dependencies": {
"@bentley/imodeljs-native": "5.0.15",
"@bentley/imodeljs-native": "5.0.16",
"@itwin/cloud-agnostic-core": "^2.2.4",
"@itwin/core-telemetry": "workspace:*",
"@itwin/object-storage-azure": "^2.2.5",
Expand All @@ -115,4 +115,4 @@
"nyc": {
"extends": "./node_modules/@itwin/build-tools/.nycrc"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies {
implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-ui:2.5.3'
implementation 'com.github.itwin:mobile-native-android:5.0.15'
implementation 'com.github.itwin:mobile-native-android:5.0.16'
implementation 'androidx.webkit:webkit:1.5.0'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@
repositoryURL = "https://github.com/iTwin/mobile-native-ios";
requirement = {
kind = exactVersion;
version = 5.0.15;
version = 5.0.16;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@
repositoryURL = "https://github.com/iTwin/mobile-native-ios";
requirement = {
kind = exactVersion;
version = 5.0.15;
version = 5.0.16;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down

0 comments on commit 8176507

Please sign in to comment.