diff --git a/ci/cli_ostesten b/ci/cli_ostesten index a409924e54..8c48d37a39 100644 --- a/ci/cli_ostesten +++ b/ci/cli_ostesten @@ -3,8 +3,8 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/en/cli; opm build; opm install oint-cli-1.14.0.ospx; del oint-cli-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/cli; opm build; opm install oint-cli-1.15.0.ospx; del oint-cli-1.15.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'"C:/Program Files (x86)/GnuPG/bin/gpg.exe" --quiet --batch --yes --decrypt --passphrase="%GPGKEY%" --output ./data.json ./data.json.gpg' } diff --git a/ci/cli_ostestru b/ci/cli_ostestru index 773cba1245..7cc7a272b3 100644 --- a/ci/cli_ostestru +++ b/ci/cli_ostestru @@ -3,8 +3,8 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install oint-cli-1.14.0.ospx; del oint-cli-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install oint-cli-1.15.0.ospx; del oint-cli-1.15.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'"C:/Program Files (x86)/GnuPG/bin/gpg.exe" --quiet --batch --yes --decrypt --passphrase="%GPGKEY%" --output ./data.json ./data.json.gpg' } diff --git a/ci/clitesten b/ci/clitesten index b3b6ac648c..2bb69af74c 100644 --- a/ci/clitesten +++ b/ci/clitesten @@ -4,7 +4,7 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' powershell encoding: 'UTF-8', script:'oscript -make ./src/en/cli/core/Classes/app.os oint.exe' } } @@ -2328,7 +2328,7 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' powershell encoding: 'UTF-8', script:'oscript -make ./src/en/cli/core/Classes/app.os oint.exe' } } diff --git a/ci/clitestru b/ci/clitestru index eb038355e6..1425c1258b 100644 --- a/ci/clitestru +++ b/ci/clitestru @@ -4,7 +4,7 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' powershell encoding: 'UTF-8', script:'oscript -make ./src/ru/cli/core/Classes/app.os oint.exe' } } @@ -2328,7 +2328,7 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' powershell encoding: 'UTF-8', script:'oscript -make ./src/ru/cli/core/Classes/app.os oint.exe' } } diff --git a/ci/main b/ci/main index 6058ef650a..b393ece6db 100644 --- a/ci/main +++ b/ci/main @@ -22,6 +22,14 @@ pipeline { } } + stahe('Local update'){ + steps { + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.15.0.ospx; del oint-1.15.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.15.0.ospx; del oint-cli-1.15.0.ospx' + } + + } + stage('Update GIT') { steps { script { diff --git a/ci/opm_push b/ci/opm_push index fd40e82fe3..ce8fd22b82 100644 --- a/ci/opm_push +++ b/ci/opm_push @@ -5,10 +5,10 @@ pipeline { steps { withCredentials([string(credentialsId: 'opm-token', variable: 'TOKEN')]) { - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.14.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm push --token $ENV:TOKEN --channel stable --file oint-1.14.0.ospx; del oint-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.15.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm push --token $ENV:TOKEN --channel stable --file oint-1.15.0.ospx; del oint-1.15.0.ospx' powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build;' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm push --token $ENV:TOKEN --channel stable --file oint-cli-1.14.0.ospx; del oint-cli-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm push --token $ENV:TOKEN --channel stable --file oint-cli-1.15.0.ospx; del oint-cli-1.15.0.ospx' } } diff --git a/ci/opm_update b/ci/opm_update index 42e47f9ba0..a328a7eb58 100644 --- a/ci/opm_update +++ b/ci/opm_update @@ -5,8 +5,8 @@ pipeline { steps { - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.14.0.ospx; del oint-1.14.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.14.0.ospx; del oint-cli-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.15.0.ospx; del oint-1.15.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.15.0.ospx; del oint-cli-1.15.0.ospx' } diff --git a/ci/os/cli_testmaker.os b/ci/os/cli_testmaker.os index b1e45e8294..f7fd0afea6 100644 --- a/ci/os/cli_testmaker.os +++ b/ci/os/cli_testmaker.os @@ -45,7 +45,7 @@ | stages { | stage('Prepare'){ | steps{ - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' | powershell encoding: 'UTF-8', script:'oscript -make ./src/" + Язык + "/cli/core/Classes/app.os oint.exe' | } | } @@ -78,7 +78,7 @@ | stages { | stage('Prepare'){ | steps{ - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' | powershell encoding: 'UTF-8', script:'oscript -make ./src/" + Язык + "/cli/core/Classes/app.os oint.exe' | } | } diff --git a/ci/os/cli_testmaker_en.os b/ci/os/cli_testmaker_en.os index 07e1191638..41a295ffd6 100644 --- a/ci/os/cli_testmaker_en.os +++ b/ci/os/cli_testmaker_en.os @@ -45,7 +45,7 @@ | stages { | stage('Prepare'){ | steps{ - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' | powershell encoding: 'UTF-8', script:'oscript -make ./src/" + Язык + "/cli/core/Classes/app.os oint.exe' | } | } @@ -78,7 +78,7 @@ | stages { | stage('Prepare'){ | steps{ - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' | powershell encoding: 'UTF-8', script:'oscript -make ./src/" + Язык + "/cli/core/Classes/app.os oint.exe' | } | } diff --git a/ci/os/internal/Modules/МетодыФормированияТестовJenkins.os b/ci/os/internal/Modules/МетодыФормированияТестовJenkins.os index 3ca5064c88..17ac252fe0 100644 --- a/ci/os/internal/Modules/МетодыФормированияТестовJenkins.os +++ b/ci/os/internal/Modules/МетодыФормированияТестовJenkins.os @@ -136,8 +136,8 @@ | stages { | stage('Prepare'){ | steps{ - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/cli; opm build; opm install oint-cli-1.14.0.ospx; del oint-cli-1.14.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/cli; opm build; opm install oint-cli-1.15.0.ospx; del oint-cli-1.15.0.ospx' | withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { | bat encoding: 'UTF-8', script:'""C:/Program Files (x86)/GnuPG/bin/gpg.exe"" --quiet --batch --yes --decrypt --passphrase=""%GPGKEY%"" --output ./data.json ./data.json.gpg' | } diff --git a/ci/os/releasemaker.os b/ci/os/releasemaker.os index ce09ada48d..355ee1c00d 100644 --- a/ci/os/releasemaker.os +++ b/ci/os/releasemaker.os @@ -10,7 +10,7 @@ Процедура НачалоРаботы() Репозиторий = "https://github.com/Bayselonarrend/OpenIntegrations"; - Версия = "1.14.0"; + Версия = "1.15.0"; Режим = "CONFIG"; //Локальные данные diff --git a/ci/ostesten b/ci/ostesten index 267fb1b5e3..66942c52e9 100644 --- a/ci/ostesten +++ b/ci/ostesten @@ -3,8 +3,8 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/en/cli; opm build; opm install oint-cli-1.14.0.ospx; del oint-cli-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/cli; opm build; opm install oint-cli-1.15.0.ospx; del oint-cli-1.15.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'"C:/Program Files (x86)/GnuPG/bin/gpg.exe" --quiet --batch --yes --decrypt --passphrase="%GPGKEY%" --output ./data.json ./data.json.gpg' } diff --git a/ci/ostestru b/ci/ostestru index 07f35ad931..2caf49eb42 100644 --- a/ci/ostestru +++ b/ci/ostestru @@ -3,8 +3,8 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.14.0.ospx; del oint-1.14.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install oint-cli-1.14.0.ospx; del oint-cli-1.14.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.15.0.ospx; del oint-1.15.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install oint-cli-1.15.0.ospx; del oint-cli-1.15.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'"C:/Program Files (x86)/GnuPG/bin/gpg.exe" --quiet --batch --yes --decrypt --passphrase="%GPGKEY%" --output ./data.json ./data.json.gpg' } diff --git a/docs/docusaurus/package-lock.json b/docs/docusaurus/package-lock.json index 7ce9d2564a..4a85a6962f 100644 --- a/docs/docusaurus/package-lock.json +++ b/docs/docusaurus/package-lock.json @@ -8577,8 +8577,8 @@ "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==" }, "node_modules/lunr-languages": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/lunr-languages/-/lunr-languages-1.14.0.tgz", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/lunr-languages/-/lunr-languages-1.15.0.tgz", "integrity": "sha512-hWUAb2KqM3L7J5bcrngszzISY4BxrXn/Xhbb9TTCJYEGqlR1nG67/M14sp09+PTIRklobrn57IAxcdcO/ZFyNA==" }, "node_modules/mark.js": { diff --git a/service/iss/en.iss b/service/iss/en.iss index 22cec45142..677272f30c 100644 --- a/service/iss/en.iss +++ b/service/iss/en.iss @@ -1,5 +1,5 @@ #define MyAppName "OInt" -#define MyAppVersion "1.14.0" +#define MyAppVersion "1.15.0" #define MyAppPublisher "bayselonarrend" #define MyAppURL "https://github.com/Bayselonarrend/OpenIntegrations" #define MyAppExeName "oint.exe" diff --git a/service/iss/ru.iss b/service/iss/ru.iss index ac4a31ce63..2d7a96847f 100644 --- a/service/iss/ru.iss +++ b/service/iss/ru.iss @@ -1,5 +1,5 @@ #define MyAppName "OInt" -#define MyAppVersion "1.14.0" +#define MyAppVersion "1.15.0" #define MyAppPublisher "bayselonarrend" #define MyAppURL "https://github.com/Bayselonarrend/OpenIntegrations" #define MyAppExeName "oint.exe" diff --git a/service/project.json b/service/project.json index 7907a3c47e..937a90fdb0 100644 --- a/service/project.json +++ b/service/project.json @@ -1,5 +1,5 @@ { -"version": "1.14.0", +"version": "1.15.0", "root": "./src/", "mainLang": "ru", "packageSrc": "OInt/", diff --git a/src/en/OInt/packagedef b/src/en/OInt/packagedef index 04348fa46d..2c6678c9ef 100644 --- a/src/en/OInt/packagedef +++ b/src/en/OInt/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint") - .Версия("1.14.0") + .Версия("1.15.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("Открытый пакет интеграций с популярными API") diff --git a/src/en/OPI/src/Configuration/Configuration.mdo b/src/en/OPI/src/Configuration/Configuration.mdo index 47eaaaf8bf..5b6278bcbb 100644 --- a/src/en/OPI/src/Configuration/Configuration.mdo +++ b/src/en/OPI/src/Configuration/Configuration.mdo @@ -26,7 +26,7 @@ PersonalComputer English Bayselonarrend - 1.14.0 + 1.15.0 en The Open Integration Package is a set of libraries for integrating with some popular APIs for 1C:Enterprise. It consists of common modules, each responsible for its own API, as well as several shared tool modules.. diff --git a/src/en/cli/.fpm b/src/en/cli/.fpm index 07f87f4c7f..764d3f91b1 100644 --- a/src/en/cli/.fpm +++ b/src/en/cli/.fpm @@ -1,7 +1,7 @@ -s dir --name oint --license mit ---version 1.14.0 +--version 1.15.0 --architecture all --depends mono-complete --description "OInt CLI - приложение для работы с API различных онлайн-сервисов из командной строки" diff --git a/src/en/cli/data/Classes/СоставБиблиотеки.os b/src/en/cli/data/Classes/СоставБиблиотеки.os index 1b4c12aa2e..daa64fab4e 100644 --- a/src/en/cli/data/Classes/СоставБиблиотеки.os +++ b/src/en/cli/data/Classes/СоставБиблиотеки.os @@ -1,7 +1,7 @@ #Использовать "./internal" Функция ПолучитьВерсию() Экспорт - Возврат "1.14.0"; + Возврат "1.15.0"; КонецФункции Функция ПолучитьСоответствиеКомандМодулей() Экспорт diff --git a/src/en/cli/packagedef b/src/en/cli/packagedef index 0eac18bfda..c026491465 100644 --- a/src/en/cli/packagedef +++ b/src/en/cli/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint-cli") - .Версия("1.14.0") + .Версия("1.15.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("CLI версия Открытого пакета интеграций") diff --git a/src/ru/OInt/packagedef b/src/ru/OInt/packagedef index 04348fa46d..2c6678c9ef 100644 --- a/src/ru/OInt/packagedef +++ b/src/ru/OInt/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint") - .Версия("1.14.0") + .Версия("1.15.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("Открытый пакет интеграций с популярными API") diff --git a/src/ru/OPI/src/Configuration/Configuration.mdo b/src/ru/OPI/src/Configuration/Configuration.mdo index 0d1ebbf99e..81dc48672d 100644 --- a/src/ru/OPI/src/Configuration/Configuration.mdo +++ b/src/ru/OPI/src/Configuration/Configuration.mdo @@ -26,7 +26,7 @@ PersonalComputer Russian Bayselonarrend - 1.14.0 + 1.15.0 ru Открытый пакет интеграций - набор библиотек для интеграции с некоторыми популярными API для 1C:Enterprise. Он состоит из общих модулей, каждый из которых отвечает за свой API, а также нескольких модулей-инструментов, общих для всех. diff --git a/src/ru/cli/.fpm b/src/ru/cli/.fpm index 07f87f4c7f..764d3f91b1 100644 --- a/src/ru/cli/.fpm +++ b/src/ru/cli/.fpm @@ -1,7 +1,7 @@ -s dir --name oint --license mit ---version 1.14.0 +--version 1.15.0 --architecture all --depends mono-complete --description "OInt CLI - приложение для работы с API различных онлайн-сервисов из командной строки" diff --git a/src/ru/cli/data/Classes/СоставБиблиотеки.os b/src/ru/cli/data/Classes/СоставБиблиотеки.os index 1b4c12aa2e..daa64fab4e 100644 --- a/src/ru/cli/data/Classes/СоставБиблиотеки.os +++ b/src/ru/cli/data/Classes/СоставБиблиотеки.os @@ -1,7 +1,7 @@ #Использовать "./internal" Функция ПолучитьВерсию() Экспорт - Возврат "1.14.0"; + Возврат "1.15.0"; КонецФункции Функция ПолучитьСоответствиеКомандМодулей() Экспорт diff --git a/src/ru/cli/packagedef b/src/ru/cli/packagedef index 0eac18bfda..c026491465 100644 --- a/src/ru/cli/packagedef +++ b/src/ru/cli/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint-cli") - .Версия("1.14.0") + .Версия("1.15.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("CLI версия Открытого пакета интеграций")