From 9e243a469ae6544e8cf523ad09b959f541c3f565 Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Wed, 11 Mar 2020 16:18:17 +0100 Subject: Upgrade to Kotlin 1.3.70 + other dependencies (Coroutinse, Serialization, Spring Boot) Major refactoring of build architecture. --- kvision-modules/kvision-base/build.gradle | 7 - kvision-modules/kvision-bootstrap-css/build.gradle | 9 - .../kvision-bootstrap-css/build.gradle.kts | 46 ++ .../package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 1 - .../kvision-bootstrap-css/webpack.config.d/file.js | 9 + .../webpack.config.d/jquery.js | 14 +- .../kvision-bootstrap-datetime/build.gradle | 9 - .../kvision-bootstrap-datetime/build.gradle.kts | 46 ++ .../package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 3 + .../webpack.config.d/file.js | 9 + .../kvision-bootstrap-dialog/build.gradle | 6 - .../kvision-bootstrap-dialog/build.gradle.kts | 44 ++ .../package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 3 + .../webpack.config.d/file.js | 9 + .../kvision-bootstrap-select-remote/build.gradle | 6 - .../build.gradle.kts | 74 +++ .../package.json.d/project.info | 3 - .../kvision/form/select/SelectRemoteInput.kt | 4 +- .../webpack.config.d/bootstrap.js | 3 + .../webpack.config.d/file.js | 9 + .../kvision-bootstrap-select/build.gradle | 10 - .../kvision-bootstrap-select/build.gradle.kts | 68 +++ .../package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 3 + .../webpack.config.d/file.js | 9 + .../webpack.config.d/jquery.js | 14 +- .../kvision-bootstrap-spinner/build.gradle | 9 - .../kvision-bootstrap-spinner/build.gradle.kts | 46 ++ .../package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 3 + .../webpack.config.d/file.js | 9 + .../webpack.config.d/jquery.js | 14 +- .../build.gradle | 6 - .../build.gradle.kts | 42 ++ .../package.json.d/project.info | 3 - .../kvision/form/text/TypeaheadRemoteInput.kt | 6 +- .../webpack.config.d/bootstrap.js | 3 + .../webpack.config.d/file.js | 9 + .../kvision-bootstrap-typeahead/build.gradle | 9 - .../kvision-bootstrap-typeahead/build.gradle.kts | 46 ++ .../package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 3 + .../webpack.config.d/file.js | 9 + .../webpack.config.d/jquery.js | 14 +- .../kvision-bootstrap-upload/build.gradle | 13 - .../kvision-bootstrap-upload/build.gradle.kts | 71 +++ .../package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 3 + .../webpack.config.d/file.js | 9 +- .../webpack.config.d/jquery.js | 14 +- kvision-modules/kvision-bootstrap/build.gradle | 12 - kvision-modules/kvision-bootstrap/build.gradle.kts | 49 ++ .../kvision-bootstrap/package.json.d/project.info | 3 - .../kotlin/pl/treksoft/kvision/panel/TabPanel.kt | 1 + .../webpack.config.d/bootstrap.js | 1 - .../kvision-bootstrap/webpack.config.d/file.js | 9 + .../kvision-bootstrap/webpack.config.d/jquery.js | 14 +- kvision-modules/kvision-chart/build.gradle | 9 - kvision-modules/kvision-chart/build.gradle.kts | 46 ++ .../kvision-chart/package.json.d/project.info | 3 - .../kvision-chart/webpack.config.d/bootstrap.js | 3 + .../kvision-chart/webpack.config.d/file.js | 9 + .../kvision-common-annotations/build.gradle | 7 - .../kvision-common-annotations/build.gradle.kts | 49 ++ .../pl/treksoft/kvision/annotations/Annotations.kt | 25 + .../pl/treksoft/kvision/annotations/Annotations.kt | 25 - kvision-modules/kvision-common-remote/build.gradle | 10 - .../kvision-common-remote/build.gradle.kts | 57 ++ .../kotlin/pl/treksoft/kvision/remote/JsonRpc.kt | 38 ++ .../pl/treksoft/kvision/remote/KVServiceMgr.kt | 28 + .../pl/treksoft/kvision/remote/RemoteTypes.kt | 56 ++ .../kotlin/pl/treksoft/kvision/remote/CallAgent.kt | 159 ++++++ .../pl/treksoft/kvision/remote/KVRemoteAgent.kt | 577 ++++++++++++++++++++ .../pl/treksoft/kvision/remote/RemoteAgent.kt | 199 +++++++ .../kotlin/pl/treksoft/kvision/remote/Security.kt | 115 ++++ .../kotlin/pl/treksoft/kvision/remote/Socket.kt | 186 +++++++ .../kotlin/pl/treksoft/kvision/remote/Utils.kt | 74 +++ .../kotlin/pl/treksoft/kvision/types/Date.kt | 91 ++++ .../pl/treksoft/kvision/remote/Annotations.kt | 30 -- .../kotlin/pl/treksoft/kvision/remote/JsonRpc.kt | 38 -- .../pl/treksoft/kvision/remote/KVServiceManager.kt | 129 ----- .../pl/treksoft/kvision/remote/RemoteTypes.kt | 48 -- kvision-modules/kvision-common-types/build.gradle | 7 - .../kvision-common-types/build.gradle.kts | 52 ++ .../kotlin/pl/treksoft/kvision/types/Date.kt | 32 ++ .../kotlin/pl/treksoft/kvision/types/Decimal.kt | 24 + .../kotlin/pl/treksoft/kvision/types/KFile.kt | 34 ++ .../kotlin/pl/treksoft/kvision/types/Date.kt | 36 ++ .../kotlin/pl/treksoft/kvision/types/Decimal.kt | 24 + .../kotlin/pl/treksoft/kvision/types/Date.kt | 200 +++++++ .../kotlin/pl/treksoft/kvision/types/Decimal.kt | 47 ++ .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 32 -- .../kotlin/pl/treksoft/kvision/types/Decimal.kt | 24 - .../main/kotlin/pl/treksoft/kvision/types/KFile.kt | 34 -- kvision-modules/kvision-cordova/build.gradle | 5 - kvision-modules/kvision-cordova/build.gradle.kts | 43 ++ .../kvision-cordova/webpack.config.d/bootstrap.js | 3 + .../kvision-cordova/webpack.config.d/file.js | 9 + kvision-modules/kvision-datacontainer/build.gradle | 1 - .../kvision-datacontainer/build.gradle.kts | 39 ++ .../package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 3 + .../kvision-datacontainer/webpack.config.d/file.js | 9 + kvision-modules/kvision-electron/build.gradle | 33 -- kvision-modules/kvision-electron/build.gradle.kts | 43 ++ .../kvision-electron/webpack.config.d/bootstrap.js | 3 + .../kvision-electron/webpack.config.d/css.js | 2 + .../kvision-electron/webpack.config.d/file.js | 9 + kvision-modules/kvision-event-flow/build.gradle | 5 - .../kvision-event-flow/build.gradle.kts | 43 ++ .../kvision-event-flow/package.json.d/project.info | 3 - .../kotlin/pl/treksoft/kvision/event/EventFlow.kt | 8 +- .../webpack.config.d/bootstrap.js | 3 + .../kvision-event-flow/webpack.config.d/file.js | 9 + kvision-modules/kvision-fontawesome/build.gradle | 9 - .../kvision-fontawesome/build.gradle.kts | 46 ++ .../package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 1 - .../kvision-fontawesome/webpack.config.d/file.js | 9 + .../kvision-fontawesome/webpack.config.d/jquery.js | 14 +- kvision-modules/kvision-handlebars/build.gradle | 10 - .../kvision-handlebars/build.gradle.kts | 47 ++ .../kvision-handlebars/package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 3 + .../kvision-handlebars/webpack.config.d/css.js | 2 + .../kvision-handlebars/webpack.config.d/file.js | 9 + kvision-modules/kvision-i18n/build.gradle | 9 - kvision-modules/kvision-i18n/build.gradle.kts | 46 ++ .../kvision-i18n/package.json.d/project.info | 3 - .../kvision-i18n/webpack.config.d/bootstrap.js | 3 + .../kvision-i18n/webpack.config.d/file.js | 9 + kvision-modules/kvision-maps/build.gradle | 9 - kvision-modules/kvision-maps/build.gradle.kts | 49 ++ .../kvision-maps/package.json.d/project.info | 3 - .../kvision-maps/webpack.config.d/bootstrap.js | 3 + .../kvision-maps/webpack.config.d/file.js | 9 +- kvision-modules/kvision-moment/build.gradle | 9 - kvision-modules/kvision-moment/build.gradle.kts | 46 ++ .../kvision-moment/package.json.d/project.info | 3 - .../kvision-moment/webpack.config.d/bootstrap.js | 3 + .../kvision-moment/webpack.config.d/css.js | 2 + .../kvision-moment/webpack.config.d/file.js | 9 + kvision-modules/kvision-pace/build.gradle | 9 - kvision-modules/kvision-pace/build.gradle.kts | 46 ++ .../kvision-pace/package.json.d/project.info | 3 - .../kvision-pace/webpack.config.d/bootstrap.js | 3 + .../kvision-pace/webpack.config.d/file.js | 9 + kvision-modules/kvision-redux-kotlin/build.gradle | 6 - .../kvision-redux-kotlin/build.gradle.kts | 45 ++ .../package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 3 + .../kvision-redux-kotlin/webpack.config.d/file.js | 9 + kvision-modules/kvision-redux/build.gradle | 16 - kvision-modules/kvision-redux/build.gradle.kts | 52 ++ .../kvision-redux/package.json.d/project.info | 3 - .../kotlin/pl/treksoft/kvision/redux/ReduxStore.kt | 7 +- .../kvision-redux/webpack.config.d/bootstrap.js | 3 + .../kvision-redux/webpack.config.d/file.js | 9 + kvision-modules/kvision-remote/build.gradle | 38 -- .../kotlin/pl/treksoft/kvision/remote/CallAgent.kt | 159 ------ .../pl/treksoft/kvision/remote/KVRemoteAgent.kt | 562 -------------------- .../pl/treksoft/kvision/remote/KVServiceManager.kt | 160 ------ .../pl/treksoft/kvision/remote/RemoteAgent.kt | 207 -------- .../kotlin/pl/treksoft/kvision/remote/Security.kt | 115 ---- .../kotlin/pl/treksoft/kvision/remote/Socket.kt | 186 ------- .../kotlin/pl/treksoft/kvision/remote/Utils.kt | 74 --- .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 97 ---- .../kotlin/pl/treksoft/kvision/types/Decimal.kt | 24 - kvision-modules/kvision-richtext/build.gradle | 9 - kvision-modules/kvision-richtext/build.gradle.kts | 67 +++ .../kvision-richtext/package.json.d/project.info | 3 - .../kvision-richtext/webpack.config.d/bootstrap.js | 3 + .../kvision-richtext/webpack.config.d/file.js | 9 + .../kvision-richtext/webpack.config.d/jquery.js | 14 +- .../kvision-server-javalin/build.gradle | 30 -- .../kvision-server-javalin/build.gradle.kts | 69 +++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 122 +++++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 160 ++++++ .../kotlin/pl/treksoft/kvision/remote/KVModules.kt | 54 ++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 565 ++++++++++++++++++++ .../treksoft/kvision/remote/SessionInterfaces.kt | 43 ++ .../kotlin/pl/treksoft/kvision/remote/KVModules.kt | 54 -- .../pl/treksoft/kvision/remote/KVServiceManager.kt | 565 -------------------- .../treksoft/kvision/remote/SessionInterfaces.kt | 43 -- .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 200 ------- .../kotlin/pl/treksoft/kvision/types/Decimal.kt | 47 -- kvision-modules/kvision-server-jooby/build.gradle | 37 -- .../kvision-server-jooby/build.gradle.kts | 68 +++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 122 +++++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 160 ++++++ .../kotlin/pl/treksoft/kvision/remote/KVModules.kt | 49 ++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 526 ++++++++++++++++++ .../treksoft/kvision/remote/SessionInterfaces.kt | 33 ++ .../kotlin/pl/treksoft/kvision/remote/KVModules.kt | 49 -- .../pl/treksoft/kvision/remote/KVServiceManager.kt | 526 ------------------ .../treksoft/kvision/remote/SessionInterfaces.kt | 33 -- .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 200 ------- .../kotlin/pl/treksoft/kvision/types/Decimal.kt | 47 -- kvision-modules/kvision-server-ktor/build.gradle | 29 - .../kvision-server-ktor/build.gradle.kts | 70 +++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 122 +++++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 160 ++++++ .../kotlin/pl/treksoft/kvision/remote/KVModules.kt | 136 +++++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 557 ++++++++++++++++++++ .../kotlin/pl/treksoft/kvision/remote/KVModules.kt | 136 ----- .../pl/treksoft/kvision/remote/KVServiceManager.kt | 557 -------------------- .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 200 ------- .../kotlin/pl/treksoft/kvision/types/Decimal.kt | 47 -- .../kvision-server-spring-boot/build.gradle | 40 -- .../kvision-server-spring-boot/build.gradle.kts | 72 +++ .../pl/treksoft/kvision/remote/Annotations.kt | 30 ++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 122 +++++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 160 ++++++ .../pl/treksoft/kvision/remote/Annotations.kt | 29 + .../kvision/remote/KVRouterConfiguration.kt | 81 +++ .../pl/treksoft/kvision/remote/KVServiceManager.kt | 586 +++++++++++++++++++++ .../treksoft/kvision/remote/KVWebSocketConfig.kt | 110 ++++ .../kotlin/pl/treksoft/kvision/remote/Security.kt | 67 +++ .../treksoft/kvision/remote/SessionInterfaces.kt | 43 ++ .../jvmMain/resources/META-INF/spring.factories | 1 + .../pl/treksoft/kvision/remote/Annotations.kt | 29 - .../kvision/remote/KVRouterConfiguration.kt | 81 --- .../pl/treksoft/kvision/remote/KVServiceManager.kt | 586 --------------------- .../treksoft/kvision/remote/KVWebSocketConfig.kt | 108 ---- .../kotlin/pl/treksoft/kvision/remote/Security.kt | 67 --- .../treksoft/kvision/remote/SessionInterfaces.kt | 43 -- .../main/kotlin/pl/treksoft/kvision/types/Date.kt | 200 ------- .../kotlin/pl/treksoft/kvision/types/Decimal.kt | 47 -- .../src/main/resources/META-INF/spring.factories | 1 - .../kvision-tabulator-remote/build.gradle | 6 - .../kvision-tabulator-remote/build.gradle.kts | 42 ++ .../package.json.d/project.info | 3 - .../treksoft/kvision/tabulator/TabulatorRemote.kt | 5 +- .../webpack.config.d/bootstrap.js | 3 + .../webpack.config.d/file.js | 9 + kvision-modules/kvision-tabulator/build.gradle | 9 - kvision-modules/kvision-tabulator/build.gradle.kts | 46 ++ .../kvision-tabulator/package.json.d/project.info | 3 - .../webpack.config.d/bootstrap.js | 3 + .../kvision-tabulator/webpack.config.d/file.js | 9 + kvision-modules/kvision-testutils/build.gradle | 61 --- kvision-modules/kvision-testutils/build.gradle.kts | 48 ++ .../webpack.config.d/bootstrap.js | 3 + .../kvision-testutils/webpack.config.d/css.js | 2 + .../kvision-testutils/webpack.config.d/file.js | 9 + kvision-modules/shared.gradle | 77 --- 249 files changed, 8155 insertions(+), 6528 deletions(-) delete mode 100644 kvision-modules/kvision-base/build.gradle delete mode 100644 kvision-modules/kvision-bootstrap-css/build.gradle create mode 100644 kvision-modules/kvision-bootstrap-css/build.gradle.kts delete mode 100644 kvision-modules/kvision-bootstrap-css/package.json.d/project.info create mode 100644 kvision-modules/kvision-bootstrap-css/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-bootstrap-datetime/build.gradle create mode 100644 kvision-modules/kvision-bootstrap-datetime/build.gradle.kts delete mode 100644 kvision-modules/kvision-bootstrap-datetime/package.json.d/project.info create mode 100644 kvision-modules/kvision-bootstrap-datetime/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-bootstrap-datetime/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-bootstrap-dialog/build.gradle create mode 100644 kvision-modules/kvision-bootstrap-dialog/build.gradle.kts delete mode 100644 kvision-modules/kvision-bootstrap-dialog/package.json.d/project.info create mode 100644 kvision-modules/kvision-bootstrap-dialog/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-bootstrap-dialog/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-bootstrap-select-remote/build.gradle create mode 100644 kvision-modules/kvision-bootstrap-select-remote/build.gradle.kts delete mode 100644 kvision-modules/kvision-bootstrap-select-remote/package.json.d/project.info create mode 100644 kvision-modules/kvision-bootstrap-select-remote/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-bootstrap-select-remote/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-bootstrap-select/build.gradle create mode 100644 kvision-modules/kvision-bootstrap-select/build.gradle.kts delete mode 100644 kvision-modules/kvision-bootstrap-select/package.json.d/project.info create mode 100644 kvision-modules/kvision-bootstrap-select/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-bootstrap-select/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-bootstrap-spinner/build.gradle create mode 100644 kvision-modules/kvision-bootstrap-spinner/build.gradle.kts delete mode 100644 kvision-modules/kvision-bootstrap-spinner/package.json.d/project.info create mode 100644 kvision-modules/kvision-bootstrap-spinner/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-bootstrap-spinner/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-bootstrap-typeahead-remote/build.gradle create mode 100644 kvision-modules/kvision-bootstrap-typeahead-remote/build.gradle.kts delete mode 100644 kvision-modules/kvision-bootstrap-typeahead-remote/package.json.d/project.info create mode 100644 kvision-modules/kvision-bootstrap-typeahead-remote/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-bootstrap-typeahead-remote/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-bootstrap-typeahead/build.gradle create mode 100644 kvision-modules/kvision-bootstrap-typeahead/build.gradle.kts delete mode 100644 kvision-modules/kvision-bootstrap-typeahead/package.json.d/project.info create mode 100644 kvision-modules/kvision-bootstrap-typeahead/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-bootstrap-typeahead/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-bootstrap-upload/build.gradle create mode 100644 kvision-modules/kvision-bootstrap-upload/build.gradle.kts delete mode 100644 kvision-modules/kvision-bootstrap-upload/package.json.d/project.info create mode 100644 kvision-modules/kvision-bootstrap-upload/webpack.config.d/bootstrap.js delete mode 100644 kvision-modules/kvision-bootstrap/build.gradle create mode 100644 kvision-modules/kvision-bootstrap/build.gradle.kts delete mode 100644 kvision-modules/kvision-bootstrap/package.json.d/project.info create mode 100644 kvision-modules/kvision-bootstrap/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-chart/build.gradle create mode 100644 kvision-modules/kvision-chart/build.gradle.kts delete mode 100644 kvision-modules/kvision-chart/package.json.d/project.info create mode 100644 kvision-modules/kvision-chart/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-chart/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-common-annotations/build.gradle create mode 100644 kvision-modules/kvision-common-annotations/build.gradle.kts create mode 100644 kvision-modules/kvision-common-annotations/src/commonMain/kotlin/pl/treksoft/kvision/annotations/Annotations.kt delete mode 100644 kvision-modules/kvision-common-annotations/src/main/kotlin/pl/treksoft/kvision/annotations/Annotations.kt delete mode 100644 kvision-modules/kvision-common-remote/build.gradle create mode 100644 kvision-modules/kvision-common-remote/build.gradle.kts create mode 100644 kvision-modules/kvision-common-remote/src/commonMain/kotlin/pl/treksoft/kvision/remote/JsonRpc.kt create mode 100644 kvision-modules/kvision-common-remote/src/commonMain/kotlin/pl/treksoft/kvision/remote/KVServiceMgr.kt create mode 100644 kvision-modules/kvision-common-remote/src/commonMain/kotlin/pl/treksoft/kvision/remote/RemoteTypes.kt create mode 100644 kvision-modules/kvision-common-remote/src/jsMain/kotlin/pl/treksoft/kvision/remote/CallAgent.kt create mode 100644 kvision-modules/kvision-common-remote/src/jsMain/kotlin/pl/treksoft/kvision/remote/KVRemoteAgent.kt create mode 100644 kvision-modules/kvision-common-remote/src/jsMain/kotlin/pl/treksoft/kvision/remote/RemoteAgent.kt create mode 100644 kvision-modules/kvision-common-remote/src/jsMain/kotlin/pl/treksoft/kvision/remote/Security.kt create mode 100644 kvision-modules/kvision-common-remote/src/jsMain/kotlin/pl/treksoft/kvision/remote/Socket.kt create mode 100644 kvision-modules/kvision-common-remote/src/jsMain/kotlin/pl/treksoft/kvision/remote/Utils.kt create mode 100644 kvision-modules/kvision-common-remote/src/jsMain/kotlin/pl/treksoft/kvision/types/Date.kt delete mode 100644 kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/Annotations.kt delete mode 100644 kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/JsonRpc.kt delete mode 100644 kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt delete mode 100644 kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/RemoteTypes.kt delete mode 100644 kvision-modules/kvision-common-types/build.gradle create mode 100644 kvision-modules/kvision-common-types/build.gradle.kts create mode 100644 kvision-modules/kvision-common-types/src/commonMain/kotlin/pl/treksoft/kvision/types/Date.kt create mode 100644 kvision-modules/kvision-common-types/src/commonMain/kotlin/pl/treksoft/kvision/types/Decimal.kt create mode 100644 kvision-modules/kvision-common-types/src/commonMain/kotlin/pl/treksoft/kvision/types/KFile.kt create mode 100644 kvision-modules/kvision-common-types/src/jsMain/kotlin/pl/treksoft/kvision/types/Date.kt create mode 100644 kvision-modules/kvision-common-types/src/jsMain/kotlin/pl/treksoft/kvision/types/Decimal.kt create mode 100644 kvision-modules/kvision-common-types/src/jvmMain/kotlin/pl/treksoft/kvision/types/Date.kt create mode 100644 kvision-modules/kvision-common-types/src/jvmMain/kotlin/pl/treksoft/kvision/types/Decimal.kt delete mode 100644 kvision-modules/kvision-common-types/src/main/kotlin/pl/treksoft/kvision/types/Date.kt delete mode 100644 kvision-modules/kvision-common-types/src/main/kotlin/pl/treksoft/kvision/types/Decimal.kt delete mode 100644 kvision-modules/kvision-common-types/src/main/kotlin/pl/treksoft/kvision/types/KFile.kt delete mode 100644 kvision-modules/kvision-cordova/build.gradle create mode 100644 kvision-modules/kvision-cordova/build.gradle.kts create mode 100644 kvision-modules/kvision-cordova/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-cordova/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-datacontainer/build.gradle create mode 100644 kvision-modules/kvision-datacontainer/build.gradle.kts delete mode 100644 kvision-modules/kvision-datacontainer/package.json.d/project.info create mode 100644 kvision-modules/kvision-datacontainer/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-datacontainer/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-electron/build.gradle create mode 100644 kvision-modules/kvision-electron/build.gradle.kts create mode 100644 kvision-modules/kvision-electron/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-electron/webpack.config.d/css.js create mode 100644 kvision-modules/kvision-electron/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-event-flow/build.gradle create mode 100644 kvision-modules/kvision-event-flow/build.gradle.kts delete mode 100644 kvision-modules/kvision-event-flow/package.json.d/project.info create mode 100644 kvision-modules/kvision-event-flow/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-event-flow/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-fontawesome/build.gradle create mode 100644 kvision-modules/kvision-fontawesome/build.gradle.kts delete mode 100644 kvision-modules/kvision-fontawesome/package.json.d/project.info create mode 100644 kvision-modules/kvision-fontawesome/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-handlebars/build.gradle create mode 100644 kvision-modules/kvision-handlebars/build.gradle.kts delete mode 100644 kvision-modules/kvision-handlebars/package.json.d/project.info create mode 100644 kvision-modules/kvision-handlebars/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-handlebars/webpack.config.d/css.js create mode 100644 kvision-modules/kvision-handlebars/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-i18n/build.gradle create mode 100644 kvision-modules/kvision-i18n/build.gradle.kts delete mode 100644 kvision-modules/kvision-i18n/package.json.d/project.info create mode 100644 kvision-modules/kvision-i18n/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-i18n/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-maps/build.gradle create mode 100644 kvision-modules/kvision-maps/build.gradle.kts delete mode 100644 kvision-modules/kvision-maps/package.json.d/project.info create mode 100644 kvision-modules/kvision-maps/webpack.config.d/bootstrap.js delete mode 100644 kvision-modules/kvision-moment/build.gradle create mode 100644 kvision-modules/kvision-moment/build.gradle.kts delete mode 100644 kvision-modules/kvision-moment/package.json.d/project.info create mode 100644 kvision-modules/kvision-moment/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-moment/webpack.config.d/css.js create mode 100644 kvision-modules/kvision-moment/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-pace/build.gradle create mode 100644 kvision-modules/kvision-pace/build.gradle.kts delete mode 100644 kvision-modules/kvision-pace/package.json.d/project.info create mode 100644 kvision-modules/kvision-pace/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-pace/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-redux-kotlin/build.gradle create mode 100644 kvision-modules/kvision-redux-kotlin/build.gradle.kts delete mode 100644 kvision-modules/kvision-redux-kotlin/package.json.d/project.info create mode 100644 kvision-modules/kvision-redux-kotlin/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-redux-kotlin/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-redux/build.gradle create mode 100644 kvision-modules/kvision-redux/build.gradle.kts delete mode 100644 kvision-modules/kvision-redux/package.json.d/project.info create mode 100644 kvision-modules/kvision-redux/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-redux/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-remote/build.gradle delete mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/CallAgent.kt delete mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVRemoteAgent.kt delete mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt delete mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/RemoteAgent.kt delete mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/Security.kt delete mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/Socket.kt delete mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/Utils.kt delete mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/types/Date.kt delete mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/types/Decimal.kt delete mode 100644 kvision-modules/kvision-richtext/build.gradle create mode 100644 kvision-modules/kvision-richtext/build.gradle.kts delete mode 100644 kvision-modules/kvision-richtext/package.json.d/project.info create mode 100644 kvision-modules/kvision-richtext/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-richtext/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-server-javalin/build.gradle create mode 100644 kvision-modules/kvision-server-javalin/build.gradle.kts create mode 100644 kvision-modules/kvision-server-javalin/src/commonMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-javalin/src/jsMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-javalin/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVModules.kt create mode 100644 kvision-modules/kvision-server-javalin/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-javalin/src/jvmMain/kotlin/pl/treksoft/kvision/remote/SessionInterfaces.kt delete mode 100644 kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/remote/KVModules.kt delete mode 100644 kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt delete mode 100644 kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/remote/SessionInterfaces.kt delete mode 100644 kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/types/Date.kt delete mode 100644 kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/types/Decimal.kt delete mode 100644 kvision-modules/kvision-server-jooby/build.gradle create mode 100644 kvision-modules/kvision-server-jooby/build.gradle.kts create mode 100644 kvision-modules/kvision-server-jooby/src/commonMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-jooby/src/jsMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-jooby/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVModules.kt create mode 100644 kvision-modules/kvision-server-jooby/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-jooby/src/jvmMain/kotlin/pl/treksoft/kvision/remote/SessionInterfaces.kt delete mode 100644 kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVModules.kt delete mode 100644 kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt delete mode 100644 kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/SessionInterfaces.kt delete mode 100644 kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/types/Date.kt delete mode 100644 kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/types/Decimal.kt delete mode 100644 kvision-modules/kvision-server-ktor/build.gradle create mode 100644 kvision-modules/kvision-server-ktor/build.gradle.kts create mode 100644 kvision-modules/kvision-server-ktor/src/commonMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-ktor/src/jsMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-ktor/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVModules.kt create mode 100644 kvision-modules/kvision-server-ktor/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt delete mode 100644 kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/remote/KVModules.kt delete mode 100644 kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt delete mode 100644 kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/types/Date.kt delete mode 100644 kvision-modules/kvision-server-ktor/src/main/kotlin/pl/treksoft/kvision/types/Decimal.kt delete mode 100644 kvision-modules/kvision-server-spring-boot/build.gradle create mode 100644 kvision-modules/kvision-server-spring-boot/build.gradle.kts create mode 100644 kvision-modules/kvision-server-spring-boot/src/commonMain/kotlin/pl/treksoft/kvision/remote/Annotations.kt create mode 100644 kvision-modules/kvision-server-spring-boot/src/commonMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-spring-boot/src/jsMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-spring-boot/src/jvmMain/kotlin/pl/treksoft/kvision/remote/Annotations.kt create mode 100644 kvision-modules/kvision-server-spring-boot/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVRouterConfiguration.kt create mode 100644 kvision-modules/kvision-server-spring-boot/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt create mode 100644 kvision-modules/kvision-server-spring-boot/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVWebSocketConfig.kt create mode 100644 kvision-modules/kvision-server-spring-boot/src/jvmMain/kotlin/pl/treksoft/kvision/remote/Security.kt create mode 100644 kvision-modules/kvision-server-spring-boot/src/jvmMain/kotlin/pl/treksoft/kvision/remote/SessionInterfaces.kt create mode 100644 kvision-modules/kvision-server-spring-boot/src/jvmMain/resources/META-INF/spring.factories delete mode 100644 kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/Annotations.kt delete mode 100644 kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVRouterConfiguration.kt delete mode 100644 kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt delete mode 100644 kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVWebSocketConfig.kt delete mode 100644 kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/Security.kt delete mode 100644 kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/SessionInterfaces.kt delete mode 100644 kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/types/Date.kt delete mode 100644 kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/types/Decimal.kt delete mode 100644 kvision-modules/kvision-server-spring-boot/src/main/resources/META-INF/spring.factories delete mode 100644 kvision-modules/kvision-tabulator-remote/build.gradle create mode 100644 kvision-modules/kvision-tabulator-remote/build.gradle.kts delete mode 100644 kvision-modules/kvision-tabulator-remote/package.json.d/project.info create mode 100644 kvision-modules/kvision-tabulator-remote/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-tabulator-remote/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-tabulator/build.gradle create mode 100644 kvision-modules/kvision-tabulator/build.gradle.kts delete mode 100644 kvision-modules/kvision-tabulator/package.json.d/project.info create mode 100644 kvision-modules/kvision-tabulator/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-tabulator/webpack.config.d/file.js delete mode 100644 kvision-modules/kvision-testutils/build.gradle create mode 100644 kvision-modules/kvision-testutils/build.gradle.kts create mode 100644 kvision-modules/kvision-testutils/webpack.config.d/bootstrap.js create mode 100644 kvision-modules/kvision-testutils/webpack.config.d/css.js create mode 100644 kvision-modules/kvision-testutils/webpack.config.d/file.js delete mode 100644 kvision-modules/shared.gradle (limited to 'kvision-modules') diff --git a/kvision-modules/kvision-base/build.gradle b/kvision-modules/kvision-base/build.gradle deleted file mode 100644 index 51970a40..00000000 --- a/kvision-modules/kvision-base/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -apply plugin: 'kotlin-platform-js' - -dependencies { - compile rootProject - compile project(path: ":", configuration: "tests") - testCompile rootProject -} diff --git a/kvision-modules/kvision-bootstrap-css/build.gradle b/kvision-modules/kvision-bootstrap-css/build.gradle deleted file mode 100644 index d18cfc13..00000000 --- a/kvision-modules/kvision-bootstrap-css/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -apply from: "../shared.gradle" - -kotlinFrontend { - - npm { - dependency("bootstrap", "4.4.1") - } - -} diff --git a/kvision-modules/kvision-bootstrap-css/build.gradle.kts b/kvision-modules/kvision-bootstrap-css/build.gradle.kts new file mode 100644 index 00000000..d9df96e0 --- /dev/null +++ b/kvision-modules/kvision-bootstrap-css/build.gradle.kts @@ -0,0 +1,46 @@ +buildscript { + extra.set("production", (findProperty("prod") ?: findProperty("production") ?: "false") == "true") +} + +plugins { + kotlin("js") + id("maven-publish") +} + +repositories() + +kotlin { + kotlinJsTargets() +} + +dependencies { + implementation(kotlin("stdlib-js")) + api(rootProject) + implementation(npm("bootstrap", "4.4.1")) + testImplementation(kotlin("test-js")) +} + +val sourcesJar by tasks.registering(Jar::class) { + archiveClassifier.set("sources") + from(kotlin.sourceSets.main.get().kotlin) +} + +publishing { + publications { + create("kotlin") { + from(components["kotlin"]) + artifact(tasks["sourcesJar"]) + pom { + defaultPom() + } + } + } +} + +setupPublication() + +tasks { + getByName("JsJar", Jar::class) { + from("${rootProject.buildDir}/js/packages/kvision-${project.name}/package.json") + } +} diff --git a/kvision-modules/kvision-bootstrap-css/package.json.d/project.info b/kvision-modules/kvision-bootstrap-css/package.json.d/project.info deleted file mode 100644 index b990974a..00000000 --- a/kvision-modules/kvision-bootstrap-css/package.json.d/project.info +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "KVision Bootstrap CSS module" -} diff --git a/kvision-modules/kvision-bootstrap-css/webpack.config.d/bootstrap.js b/kvision-modules/kvision-bootstrap-css/webpack.config.d/bootstrap.js index 32a7c4d0..35b28e6a 100644 --- a/kvision-modules/kvision-bootstrap-css/webpack.config.d/bootstrap.js +++ b/kvision-modules/kvision-bootstrap-css/webpack.config.d/bootstrap.js @@ -1,4 +1,3 @@ config.module.rules.push({test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'}); config.module.rules.push({test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'}); config.module.rules.push({test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'}); -config.module.rules.push({test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml'}); diff --git a/kvision-modules/kvision-bootstrap-css/webpack.config.d/file.js b/kvision-modules/kvision-bootstrap-css/webpack.config.d/file.js new file mode 100644 index 00000000..653ca21f --- /dev/null +++ b/kvision-modules/kvision-bootstrap-css/webpack.config.d/file.js @@ -0,0 +1,9 @@ +config.module.rules.push( + { + test: /\.(jpe?g|png|gif|svg)$/i, + loader: 'file-loader', + options: { + esModule: false, + }, + } +); diff --git a/kvision-modules/kvision-bootstrap-css/webpack.config.d/jquery.js b/kvision-modules/kvision-bootstrap-css/webpack.config.d/jquery.js index bf5a1a20..e6c6b219 100644 --- a/kvision-modules/kvision-bootstrap-css/webpack.config.d/jquery.js +++ b/kvision-modules/kvision-bootstrap-css/webpack.config.d/jquery.js @@ -1,5 +1,9 @@ -config.plugins.push(new webpack.ProvidePlugin({ - $: "jquery", - jQuery: "jquery", - "window.jQuery": "jquery" -})); +;(function() { + const webpack = require('webpack') + + config.plugins.push(new webpack.ProvidePlugin({ + $: "jquery", + jQuery: "jquery", + "window.jQuery": "jquery" + })); +})(); diff --git a/kvision-modules/kvision-bootstrap-datetime/build.gradle b/kvision-modules/kvision-bootstrap-datetime/build.gradle deleted file mode 100644 index 54902008..00000000 --- a/kvision-modules/kvision-bootstrap-datetime/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -apply from: "../shared.gradle" - -kotlinFrontend { - - npm { - dependency("pc-bootstrap4-datetimepicker", "4.17.50") - } - -} diff --git a/kvision-modules/kvision-bootstrap-datetime/build.gradle.kts b/kvision-modules/kvision-bootstrap-datetime/build.gradle.kts new file mode 100644 index 00000000..f2340ad9 --- /dev/null +++ b/kvision-modules/kvision-bootstrap-datetime/build.gradle.kts @@ -0,0 +1,46 @@ +buildscript { + extra.set("production", (findProperty("prod") ?: findProperty("production") ?: "false") == "true") +} + +plugins { + kotlin("js") + id("maven-publish") +} + +repositories() + +kotlin { + kotlinJsTargets() +} + +dependencies { + implementation(kotlin("stdlib-js")) + api(rootProject) + implementation(npm("pc-bootstrap4-datetimepicker", "4.17.50")) + testImplementation(kotlin("test-js")) +} + +val sourcesJar by tasks.registering(Jar::class) { + archiveClassifier.set("sources") + from(kotlin.sourceSets.main.get().kotlin) +} + +publishing { + publications { + create("kotlin") { + from(components["kotlin"]) + artifact(tasks["sourcesJar"]) + pom { + defaultPom() + } + } + } +} + +setupPublication() + +tasks { + getByName("JsJar", Jar::class) { + from("${rootProject.buildDir}/js/packages/kvision-${project.name}/package.json") + } +} diff --git a/kvision-modules/kvision-bootstrap-datetime/package.json.d/project.info b/kvision-modules/kvision-bootstrap-datetime/package.json.d/project.info deleted file mode 100644 index 3d332806..00000000 --- a/kvision-modules/kvision-bootstrap-datetime/package.json.d/project.info +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "KVision Datetime module" -} diff --git a/kvision-modules/kvision-bootstrap-datetime/webpack.config.d/bootstrap.js b/kvision-modules/kvision-bootstrap-datetime/webpack.config.d/bootstrap.js new file mode 100644 index 00000000..35b28e6a --- /dev/null +++ b/kvision-modules/kvision-bootstrap-datetime/webpack.config.d/bootstrap.js @@ -0,0 +1,3 @@ +config.module.rules.push({test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'}); +config.module.rules.push({test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'}); +config.module.rules.push({test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'}); diff --git a/kvision-modules/kvision-bootstrap-datetime/webpack.config.d/file.js b/kvision-modules/kvision-bootstrap-datetime/webpack.config.d/file.js new file mode 100644 index 00000000..653ca21f --- /dev/null +++ b/kvision-modules/kvision-bootstrap-datetime/webpack.config.d/file.js @@ -0,0 +1,9 @@ +config.module.rules.push( + { + test: /\.(jpe?g|png|gif|svg)$/i, + loader: 'file-loader', + options: { + esModule: false, + }, + } +); diff --git a/kvision-modules/kvision-bootstrap-dialog/build.gradle b/kvision-modules/kvision-bootstrap-dialog/build.gradle deleted file mode 100644 index 652d14d6..00000000 --- a/kvision-modules/kvision-bootstrap-dialog/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -apply from: "../shared.gradle" - -dependencies { - compile project(":kvision-modules:kvision-bootstrap") - compile "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion" -} diff --git a/kvision-modules/kvision-bootstrap-dialog/build.gradle.kts b/kvision-modules/kvision-bootstrap-dialog/build.gradle.kts new file mode 100644 index 00000000..1065b02a --- /dev/null +++ b/kvision-modules/kvision-bootstrap-dialog/build.gradle.kts @@ -0,0 +1,44 @@ +buildscript { + extra.set("production", (findProperty("prod") ?: findProperty("production") ?: "false") == "true") +} + +plugins { + kotlin("js") + id("maven-publish") +} + +repositories() + +// Versions +val coroutinesVersion: String by project + +kotlin { + kotlinJsTargets() +} + +dependencies { + implementation(kotlin("stdlib-js")) + api(rootProject) + api(project(":kvision-modules:kvision-bootstrap")) + api("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion") + testImplementation(kotlin("test-js")) +} + +val sourcesJar by tasks.registering(Jar::class) { + archiveClassifier.set("sources") + from(kotlin.sourceSets.main.get().kotlin) +} + +publishing { + publications { + create("kotlin") { + from(components["kotlin"]) + artifact(tasks["sourcesJar"]) + pom { + defaultPom() + } + } + } +} + +setupPublication() diff --git a/kvision-modules/kvision-bootstrap-dialog/package.json.d/project.info b/kvision-modules/kvision-bootstrap-dialog/package.json.d/project.info deleted file mode 100644 index 416cd4a7..00000000 --- a/kvision-modules/kvision-bootstrap-dialog/package.json.d/project.info +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "KVision Dialog module" -} diff --git a/kvision-modules/kvision-bootstrap-dialog/webpack.config.d/bootstrap.js b/kvision-modules/kvision-bootstrap-dialog/webpack.config.d/bootstrap.js new file mode 100644 index 00000000..35b28e6a --- /dev/null +++ b/kvision-modules/kvision-bootstrap-dialog/webpack.config.d/bootstrap.js @@ -0,0 +1,3 @@ +config.module.rules.push({test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'}); +config.module.rules.push({test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'}); +config.module.rules.push({test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'}); diff --git a/kvision-modules/kvision-bootstrap-dialog/webpack.config.d/file.js b/kvision-modules/kvision-bootstrap-dialog/webpack.config.d/file.js new file mode 100644 index 00000000..653ca21f --- /dev/null +++ b/kvision-modules/kvision-bootstrap-dialog/webpack.config.d/file.js @@ -0,0 +1,9 @@ +config.module.rules.push( + { + test: /\.(jpe?g|png|gif|svg)$/i, + loader: 'file-loader', + options: { + esModule: false, + }, + } +); diff --git a/kvision-modules/kvision-bootstrap-select-remote/build.gradle b/kvision-modules/kvision-bootstrap-select-remote/build.gradle deleted file mode 100644 index 7a4dc8fa..00000000 --- a/kvision-modules/kvision-bootstrap-select-remote/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -apply from: "../shared.gradle" - -dependencies { - compile project(":kvision-modules:kvision-bootstrap-select") - compile project(":kvision-modules:kvision-remote") -} diff --git a/kvision-modules/kvision-bootstrap-select-remote/build.gradle.kts b/kvision-modules/kvision-bootstrap-select-remote/build.gradle.kts new file mode 100644 index 00000000..e7b28ac8 --- /dev/null +++ b/kvision-modules/kvision-bootstrap-select-remote/build.gradle.kts @@ -0,0 +1,74 @@ +buildscript { + extra.set("production", (findProperty("prod") ?: findProperty("production") ?: "false") == "true") +} + +plugins { + kotlin("js") + id("maven-publish") +} + +repositories() + +kotlin { + kotlinJsTargets() +} + +dependencies { + implementation(kotlin("stdlib-js")) + api(rootProject) + api(project(":kvision-modules:kvision-bootstrap-select")) + api(project(":kvision-modules:kvision-common-remote")) + compileOnly(project(":kvision-modules:kvision-server-javalin")) + testImplementation(kotlin("test-js")) +} + +val sourcesJar by tasks.registering(Jar::class) { + archiveClassifier.set("sources") + from(kotlin.sourceSets.main.get().kotlin) +} + +publishing { + publications { + create("kotlin") { + from(components["kotlin"]) + artifact(tasks["sourcesJar"]) + pom { + defaultPom() + } + } + } +} + +setupPublication() + +fun copyResources() { + copy { + from("$buildDir/processedResources/Js/main") + into("${rootProject.buildDir}/js/packages/kvision-${project.name}/kotlin") + } + copy { + from("$buildDir/processedResources/Js/main") + into("${rootProject.buildDir}/js/packages/kvision-${project.name}/kotlin-dce") + } + copy { + from("${rootProject.projectDir}/kvision-modules/kvision-bootstrap-select/src/main/resources") + into("${rootProject.buildDir}/js/packages/kvision-${project.name}/kotlin") + } + copy { + from("${rootProject.projectDir}/kvision-modules/kvision-bootstrap-select/src/main/resources") + into("${rootProject.buildDir}/js/packages/kvision-${project.name}/kotlin-dce") + } +} + +tasks { + getByName("compileTestKotlinJs") { + doLast { + copyResources() + } + } + getByName("processDceKotlinJs") { + doLast { + copyResources() + } + } +} diff --git a/kvision-modules/kvision-bootstrap-select-remote/package.json.d/project.info b/kvision-modules/kvision-bootstrap-select-remote/package.json.d/project.info deleted file mode 100644 index 5685d581..00000000 --- a/kvision-modules/kvision-bootstrap-select-remote/package.json.d/project.info +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "KVision Select remote addon module" -} diff --git a/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemoteInput.kt b/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemoteInput.kt index 6092fd93..e7fd384c 100644 --- a/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemoteInput.kt +++ b/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemoteInput.kt @@ -25,7 +25,7 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.await import kotlinx.coroutines.launch import kotlinx.serialization.ImplicitReflectionSerializer -import kotlinx.serialization.list +import kotlinx.serialization.builtins.list import kotlinx.serialization.stringify import org.w3c.dom.get import pl.treksoft.kvision.core.Container @@ -53,7 +53,7 @@ external fun decodeURIComponent(encodedURI: String): String * @param preload preload all options from remote data source * @param classes a set of CSS class names */ -@UseExperimental(ImplicitReflectionSerializer::class) +@OptIn(ImplicitReflectionSerializer::class) open class SelectRemoteInput( serviceManager: KVServiceManager, function: suspend T.(String?, String?, String?) -> List, diff --git a/kvision-modules/kvision-bootstrap-select-remote/webpack.config.d/bootstrap.js b/kvision-modules/kvision-bootstrap-select-remote/webpack.config.d/bootstrap.js new file mode 100644 index 00000000..35b28e6a --- /dev/null +++ b/kvision-modules/kvision-bootstrap-select-remote/webpack.config.d/bootstrap.js @@ -0,0 +1,3 @@ +config.module.rules.push({test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'}); +config.module.rules.push({test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'}); +config.module.rules.push({test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'}); diff --git a/kvision-modules/kvision-bootstrap-select-remote/webpack.config.d/file.js b/kvision-modules/kvision-bootstrap-select-remote/webpack.config.d/file.js new file mode 100644 index 00000000..653ca21f --- /dev/null +++ b/kvision-modules/kvision-bootstrap-select-remote/webpack.config.d/file.js @@ -0,0 +1,9 @@ +config.module.rules.push( + { + test: /\.(jpe?g|png|gif|svg)$/i, + loader: 'file-loader', + options: { + esModule: false, + }, + } +); diff --git a/kvision-modules/kvision-bootstrap-select/build.gradle b/kvision-modules/kvision-bootstrap-select/build.gradle deleted file mode 100644 index 01ec3ad0..00000000 --- a/kvision-modules/kvision-bootstrap-select/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply from: "../shared.gradle" - -kotlinFrontend { - - npm { - dependency("bootstrap-select", "1.13.12") - dependency("ajax-bootstrap-select", "1.4.5") - } - -} diff --git a/kvision-modules/kvision-bootstrap-select/build.gradle.kts b/kvision-modules/kvision-bootstrap-select/build.gradle.kts new file mode 100644 index 00000000..1db76c5d --- /dev/null +++ b/kvision-modules/kvision-bootstrap-select/build.gradle.kts @@ -0,0 +1,68 @@ +buildscript { + extra.set("production", (findProperty("prod") ?: findProperty("production") ?: "false") == "true") +} + +plugins { + kotlin("js") + id("maven-publish") +} + +repositories() + +kotlin { + kotlinJsTargets() +} + +dependencies { + implementation(kotlin("stdlib-js")) + api(rootProject) + implementation(npm("bootstrap-select", "1.13.12")) + implementation(npm("ajax-bootstrap-select", "1.4.5")) + testImplementation(kotlin("test-js")) +} + +val sourcesJar by tasks.registering(Jar::class) { + archiveClassifier.set("sources") + from(kotlin.sourceSets.main.get().kotlin) +} + +publishing { + publications { + create("kotlin") { + from(components["kotlin"]) + artifact(tasks["sourcesJar"]) + pom { + defaultPom() + } + } + } +} + +setupPublication() + +fun copyResources() { + copy { + from("$buildDir/processedResources/Js/main") + into("${rootProject.buildDir}/js/packages/kvision-${project.name}/kotlin") + } + copy { + from("$buildDir/processedResources/Js/main") + into("${rootProject.buildDir}/js/packages/kvision-${project.name}/kotlin-dce") + } +} + +tasks { + getByName("JsJar", Jar::class) { + from("${rootProject.buildDir}/js/packages/kvision-${project.name}/package.json") + } + getByName("compileTestKotlinJs") { + doLast { + copyResources() + } + } + getByName("processDceKotlinJs") { + doLast { + copyResources() + } + } +} diff --git a/kvision-modules/kvision-bootstrap-select/package.json.d/project.info b/kvision-modules/kvision-bootstrap-select/package.json.d/project.info deleted file mode 100644 index 80e675b0..00000000 --- a/kvision-modules/kvision-bootstrap-select/package.json.d/project.info +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "KVision Select module" -} diff --git a/kvision-modules/kvision-bootstrap-select/webpack.config.d/bootstrap.js b/kvision-modules/kvision-bootstrap-select/webpack.config.d/bootstrap.js new file mode 100644 index 00000000..35b28e6a --- /dev/null +++ b/kvision-modules/kvision-bootstrap-select/webpack.config.d/bootstrap.js @@ -0,0 +1,3 @@ +config.module.rules.push({test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'}); +config.module.rules.push({test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'}); +config.module.rules.push({test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'}); diff --git a/kvision-modules/kvision-bootstrap-select/webpack.config.d/file.js b/kvision-modules/kvision-bootstrap-select/webpack.config.d/file.js new file mode 100644 index 00000000..653ca21f --- /dev/null +++ b/kvision-modules/kvision-bootstrap-select/webpack.config.d/file.js @@ -0,0 +1,9 @@ +config.module.rules.push( + { + test: /\.(jpe?g|png|gif|svg)$/i, + loader: 'file-loader', + options: { + esModule: false, + }, + } +); diff --git a/kvision-modules/kvision-bootstrap-select/webpack.config.d/jquery.js b/kvision-modules/kvision-bootstrap-select/webpack.config.d/jquery.js index bf5a1a20..e6c6b219 100644 --- a/kvision-modules/kvision-bootstrap-select/webpack.config.d/jquery.js +++ b/kvision-modules/kvision-bootstrap-select/webpack.config.d/jquery.js @@ -1,5 +1,9 @@ -config.plugins.push(new webpack.ProvidePlugin({ - $: "jquery", - jQuery: "jquery", - "window.jQuery": "jquery" -})); +;(function() { + const webpack = require('webpack') + + config.plugins.push(new webpack.ProvidePlugin({ + $: "jquery", + jQuery: "jquery", + "window.jQuery": "jquery" + })); +})(); diff --git a/kvision-modules/kvision-bootstrap-spinner/build.gradle b/kvision-modules/kvision-bootstrap-spinner/build.gradle deleted file mode 100644 index 0c3a2940..00000000 --- a/kvision-modules/kvision-bootstrap-spinner/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -apply from: "../shared.gradle" - -kotlinFrontend { - - npm { - dependency("bootstrap-touchspin", "4.2.5") - } - -} diff --git a/kvision-modules/kvision-bootstrap-spinner/build.gradle.kts b/kvision-modules/kvision-bootstrap-spinner/build.gradle.kts new file mode 100644 index 00000000..19453b54 --- /dev/null +++ b/kvision-modules/kvision-bootstrap-spinner/build.gradle.kts @@ -0,0 +1,46 @@ +buildscript { + extra.set("production", (findProperty("prod") ?: findProperty("production") ?: "false") == "true") +} + +plugins { + kotlin("js") + id("maven-publish") +} + +repositories() + +kotlin { + kotlinJsTargets() +} + +dependencies { + implementation(kotlin("stdlib-js")) + api(rootProject) + implementation(npm("bootstrap-touchspin", "4.2.5")) + testImplementation(kotlin("test-js")) +} + +val sourcesJar by tasks.registering(Jar::class) { + archiveClassifier.set("sources") + from(kotlin.sourceSets.main.get().kotlin) +} + +publishing { + publications { + create("kotlin") { + from(components["kotlin"]) + artifact(tasks["sourcesJar"]) + pom { + defaultPom() + } + } + } +} + +setupPublication() + +tasks { + getByName("JsJar", Jar::class) { + from("${rootProject.buildDir}/js/packages/kvision-${project.name}/package.json") + } +} diff --git a/kvision-modules/kvision-bootstrap-spinner/package.json.d/project.info b/kvision-modules/kvision-bootstrap-spinner/package.json.d/project.info deleted file mode 100644 index fb0c7956..00000000 --- a/kvision-modules/kvision-bootstrap-spinner/package.json.d/project.info +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "KVision Spinner module" -} diff --git a/kvision-modules/kvision-bootstrap-spinner/webpack.config.d/bootstrap.js b/kvision-modules/kvision-bootstrap-spinner/webpack.config.d/bootstrap.js new file mode 100644 index 00000000..35b28e6a --- /dev/null +++ b/kvision-modules/kvision-bootstrap-spinner/webpack.config.d/bootstrap.js @@ -0,0 +1,3 @@ +config.module.rules.push({test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'}); +config.module.rules.push({test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'}); +config.module.rules.push({test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'}); diff --git a/kvision-modules/kvision-bootstrap-spinner/webpack.config.d/file.js b/kvision-modules/kvision-bootstrap-spinner/webpack.config.d/file.js new file mode 100644 index 00000000..653ca21f --- /dev/null +++ b/kvision-modules/kvision-bootstrap-spinner/webpack.config.d/file.js @@ -0,0 +1,9 @@ +config.module.rules.push( + { + test: /\.(jpe?g|png|gif|svg)$/i, + loader: 'file-loader', + options: { + esModule: false, + }, + } +); diff --git a/kvision-modules/kvision-bootstrap-spinner/webpack.config.d/jquery.js b/kvision-modules/kvision-bootstrap-spinner/webpack.config.d/jquery.js index bf5a1a20..e6c6b219 100644 --- a/kvision-modules/kvision-bootstrap-spinner/webpack.config.d/jquery.js +++ b/kvision-modules/kvision-bootstrap-spinner/webpack.config.d/jquery.js @@ -1,5 +1,9 @@ -config.plugins.push(new webpack.ProvidePlugin({ - $: "jquery", - jQuery: "jquery", - "window.jQuery": "jquery" -})); +;(function() { + const webpack = require('webpack') + + config.plugins.push(new webpack.ProvidePlugin({ + $: "jquery", + jQuery: "jquery", + "window.jQuery": "jquery" + })); +})(); diff --git a/kvision-modules/kvision-bootstrap-typeahead-remote/build.gradle b/kvision-modules/kvision-bootstrap-typeahead-remote/build.gradle deleted file mode 100644 index cab403d5..00000000 --- a/kvision-modules/kvision-bootstrap-typeahead-remote/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -apply from: "../shared.gradle" - -dependencies { - compile project(":kvision-modules:kvision-bootstrap-typeahead") - compile project(":kvision-modules:kvision-remote") -} diff --git a/kvision-modules/kvision-bootstrap-typeahead-remote/build.gradle.kts b/kvision-modules/kvision-bootstrap-typeahead-remote/build.gradle.kts new file mode 100644 index 00000000..a94b0ce9 --- /dev/null +++ b/kvision-modules/kvision-bootstrap-typeahead-remote/build.gradle.kts @@ -0,0 +1,42 @@ +buildscript { + extra.set("production", (findProperty("prod") ?: findProperty("production") ?: "false") == "true") +} + +plugins { + kotlin("js") + id("maven-publish") +} + +repositories() + +kotlin { + kotlinJsTargets() +} + +dependencies { + implementation(kotlin("stdlib-js")) + api(rootProject) + api(project(":kvision-modules:kvision-bootstrap-typeahead")) + api(project(":kvision-modules:kvision-common-remote")) + compileOnly(project(":kvision-modules:kvision-server-javalin")) + testImplementation(kotlin("test-js")) +} + +val sourcesJar by tasks.registering(Jar::class) { + archiveClassifier.set("sources") + from(kotlin.sourceSets.main.get().kotlin) +} + +publishing { + publications { + create("kotlin") { + from(components["kotlin"]) + artifact(tasks["sourcesJar"]) + pom { + defaultPom() + } + } + } +} + +setupPublication() diff --git a/kvision-modules/kvision-bootstrap-typeahead-remote/package.json.d/project.info b/kvision-modules/kvision-bootstrap-typeahead-remote/package.json.d/project.info deleted file mode 100644 index 15dc8333..00000000 --- a/kvision-modules/kvision-bootstrap-typeahead-remote/package.json.d/project.info +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "KVision Typeahead remote addon module" -} diff --git a/kvision-modules/kvision-bootstrap-typeahead-remote/src/main/kotlin/pl/treksoft/kvision/form/text/TypeaheadRemoteInput.kt b/kvision-modules/kvision-bootstrap-typeahead-remote/src/main/kotlin/pl/treksoft/kvision/form/text/TypeaheadRemoteInput.kt index e56468d1..42412ae4 100644 --- a/kvision-modules/kvision-bootstrap-typeahead-remote/src/main/kotlin/pl/treksoft/kvision/form/text/TypeaheadRemoteInput.kt +++ b/kvision-modules/kvision-bootstrap-typeahead-remote/src/main/kotlin/pl/treksoft/kvision/form/text/TypeaheadRemoteInput.kt @@ -22,8 +22,8 @@ package pl.treksoft.kvision.form.text import kotlinx.serialization.ImplicitReflectionSerializer -import kotlinx.serialization.list -import kotlinx.serialization.serializer +import kotlinx.serialization.builtins.list +import kotlinx.serialization.builtins.serializer import kotlinx.serialization.stringify import org.w3c.dom.get import pl.treksoft.kvision.core.Container @@ -46,7 +46,7 @@ import kotlin.browser.window * @param value text input value * @param classes a set of CSS class names */ -@UseExperimental(ImplicitReflectionSerializer::class) +@OptIn(ImplicitReflectionSerializer::class) open class TypeaheadRemoteInput( serviceManager: KVServiceManager, function: suspend T.(String?, String?) -> List, diff --git a/kvision-modules/kvision-bootstrap-typeahead-remote/webpack.config.d/bootstrap.js b/kvision-modules/kvision-bootstr