From 76c7fb3b0c19fd2f3f103351c9c5869958ecb38d Mon Sep 17 00:00:00 2001 From: Maria Orlova Date: Tue, 20 Apr 2021 16:51:38 +0400 Subject: [PATCH] Create separate modules for charts and pivot-table widgets Haulmont/jmix-ui#433 1. Add modules: charts-widgets, pivot-table-widgets 2. Move widgets (JmixAmchartsSceneWidget, JmixAmStockChartSceneWidget), connectors (e.g. JmixAmchartsSceneConnector) and classes related to them, ChartsWidgetSet.gwt.xml to charts-widgets module 3. Move JmixPivotTableSceneWidget, connectors: JmixPivotTableSceneConnector, JmixPivotTableExtensionConnector and classes related to them, PivotTableWidgetSet.gwt.xml to pivot-table-widgets module --- build.gradle | 2 ++ settings.gradle | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index f7a91c3..41ea296 100644 --- a/build.gradle +++ b/build.gradle @@ -121,8 +121,10 @@ def dependencySubstitutionMap = [ 'io.jmix.ui:jmix-ui-widgets-compiled' : 'ui-widgets-compiled', 'io.jmix.ui:jmix-charts' : 'charts', 'io.jmix.ui:jmix-charts-starter' : 'charts-starter', + 'io.jmix.ui:jmix-charts-widgets' : 'charts-widgets', 'io.jmix.ui:jmix-pivot-table' : 'pivot-table', 'io.jmix.ui:jmix-pivot-table-starter' : 'pivot-table-starter', + 'io.jmix.ui:jmix-pivot-table-widgets' : 'pivot-table-widgets', ] if (System.getenv("JMIX_USE_PRIVATE_REPOSITORIES")) { diff --git a/settings.gradle b/settings.gradle index 51f74a6..22ae05e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -127,8 +127,10 @@ includeProject('ui-widgets', 'jmix-ui/ui-widgets') includeProject('ui-widgets-compiled', 'jmix-ui/ui-widgets-compiled') includeProject('charts', 'jmix-ui/charts') includeProject('charts-starter', 'jmix-ui/charts-starter') +includeProject('charts-widgets', 'jmix-ui/charts-widgets') includeProject('pivot-table', 'jmix-ui/pivot-table') includeProject('pivot-table-starter', 'jmix-ui/pivot-table-starter') +includeProject('pivot-table-widgets', 'jmix-ui/pivot-table-widgets') includeProject('sampler', 'jmix-sampler', false)