Skip to content

Commit 7199442

Browse files
Merge pull request #141 from REGnosys/upgradeCDMandDSL
STORY-4303 TASK-10842 Upgrade Object Builder to latest CDM
2 parents 6212166 + 698b506 commit 7199442

File tree

52 files changed

+26570
-31789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+26570
-31789
lines changed

netlify.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[build]
2+
base = "ui/"
3+
command = "npm run build"
4+
publish = "dist/ui/browser"

setup/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<maven.compiler.source>17</maven.compiler.source>
1717
<maven.compiler.target>17</maven.compiler.target>
18-
<finos.cdm.version>[7.0.0-dev.37,8.0.0)</finos.cdm.version>
19-
<rosetta.dsl.version>9.64.0</rosetta.dsl.version>
18+
<finos.cdm.version>[7.0.0-dev.62,8.0.0)</finos.cdm.version>
19+
<rosetta.dsl.version>9.68.0</rosetta.dsl.version>
2020
<xtext.version>2.38.0</xtext.version>
2121
<guice.version>6.0.0</guice.version>
2222
<logback.version>1.4.14</logback.version>

ui/.browserslistrc

Lines changed: 0 additions & 16 deletions
This file was deleted.

ui/angular.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,24 @@
2222
"prefix": "app",
2323
"architect": {
2424
"build": {
25-
"builder": "@angular-devkit/build-angular:browser",
25+
"builder": "@angular-devkit/build-angular:application",
2626
"options": {
27-
"outputPath": "dist/ui",
27+
"outputPath": {
28+
"base": "dist/ui"
29+
},
2830
"index": "src/index.html",
29-
"main": "src/main.ts",
30-
"polyfills": "src/polyfills.ts",
31+
"polyfills": [
32+
"src/polyfills.ts"
33+
],
3134
"tsConfig": "tsconfig.app.json",
3235
"inlineStyleLanguage": "scss",
3336
"assets": ["src/favicon.ico", "src/assets"],
3437
"styles": [
3538
"./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
3639
"src/styles.scss"
3740
],
38-
"scripts": []
41+
"scripts": [],
42+
"browser": "src/main.ts"
3943
},
4044
"configurations": {
4145
"production": {
@@ -60,9 +64,7 @@
6064
"outputHashing": "all"
6165
},
6266
"development": {
63-
"buildOptimizer": false,
6467
"optimization": false,
65-
"vendorChunk": true,
6668
"extractLicenses": false,
6769
"sourceMap": true,
6870
"namedChunks": true
@@ -74,18 +76,18 @@
7476
"builder": "@angular-devkit/build-angular:dev-server",
7577
"configurations": {
7678
"production": {
77-
"browserTarget": "ui:build:production"
79+
"buildTarget": "ui:build:production"
7880
},
7981
"development": {
80-
"browserTarget": "ui:build:development"
82+
"buildTarget": "ui:build:development"
8183
}
8284
},
8385
"defaultConfiguration": "development"
8486
},
8587
"extract-i18n": {
8688
"builder": "@angular-devkit/build-angular:extract-i18n",
8789
"options": {
88-
"browserTarget": "ui:build"
90+
"buildTarget": "ui:build"
8991
}
9092
},
9193
"test": {

0 commit comments

Comments
 (0)