From 7d30ca0260bb4d7fa629a9c2c8d995879dec80d4 Mon Sep 17 00:00:00 2001 From: Anton Titovets Date: Thu, 26 Mar 2026 09:19:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BD=D1=8F=D1=82=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D1=80=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/config.json | 2 +- docs/docusaurus/src/pages/download.js | 30 +++++++++---------- service/iss/en.iss | 2 +- service/iss/ru.iss | 2 +- service/templates/jenkins/cli_test_deb.txt | 6 ++-- service/templates/jenkins/cli_test_rpm.txt | 6 ++-- .../templates/jenkins/cli_test_windows.txt | 4 +-- service/templates/jenkins/os_test_linux.txt | 2 +- service/templates/jenkins/os_test_windows.txt | 2 +- src/en/OInt/packagedef | 2 +- .../Modules/internal/Modules/OPI_Tools.os | 2 +- .../src/CommonModules/OPI_Tools/Module.bsl | 2 +- .../OPI/src/Configuration/Configuration.mdo | 2 +- src/en/cli/data/Classes/index/lib.json | 2 +- src/en/cli/packagedef | 4 +-- src/ru/OInt/packagedef | 2 +- .../internal/Modules/OPI_Инструменты.os | 2 +- .../CommonModules/OPI_Инструменты/Module.bsl | 2 +- .../OPI/src/Configuration/Configuration.mdo | 2 +- src/ru/cli/data/Classes/index/lib.json | 2 +- src/ru/cli/packagedef | 4 +-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ci/config.json b/ci/config.json index 6287e45f735..5713398485d 100644 --- a/ci/config.json +++ b/ci/config.json @@ -4,7 +4,7 @@ "value": { "version": { "description": "Current project version", - "value": "1.34.0" + "value": "2.0.0" }, "repoUrl": { "description": "Repository URL", diff --git a/docs/docusaurus/src/pages/download.js b/docs/docusaurus/src/pages/download.js index 63d1340f134..9dc5d61b222 100644 --- a/docs/docusaurus/src/pages/download.js +++ b/docs/docusaurus/src/pages/download.js @@ -17,8 +17,8 @@ const DownloadPage = () => { { name: 'CFE (расширение)', files: { - ru: 'OpenIntegrations_1.34.0_ru.cfe', - en: 'OpenIntegrations_1.34.0_en.cfe', + ru: 'OpenIntegrations_2.0.0_ru.cfe', + en: 'OpenIntegrations_2.0.0_en.cfe', }, desc: 'Файл расширения 1С в формате .cfe', }, @@ -46,32 +46,32 @@ const DownloadPage = () => { { name: 'Windows Installer', files: { - ru: 'oint_1.34.0_installer_ru.exe', - en: 'oint_1.34.0_installer_en.exe', + ru: 'oint_2.0.0_installer_ru.exe', + en: 'oint_2.0.0_installer_en.exe', }, desc: 'Windows установщик CLI приложения с аддоном Melezh', }, { name: 'Debian / Ubuntu (.deb)', files: { - ru: 'oint_1.34.0_all_ru.deb', - en: 'oint_1.34.0_all_en.deb', + ru: 'oint_2.0.0_all_ru.deb', + en: 'oint_2.0.0_all_en.deb', }, desc: 'Пакет CLI приложения для систем на базе Debian', }, { name: 'Fedora / RHEL (.rpm)', files: { - ru: 'oint-1.34.0-1.noarch_ru.rpm', - en: 'oint-1.34.0-1.noarch_en.rpm', + ru: 'oint-2.0.0-1.noarch_ru.rpm', + en: 'oint-2.0.0-1.noarch_en.rpm', }, desc: 'Пакет CLI приложения для систем на базе RHEL', }, { name: 'Linux (.AppImage)', files: { - ru: 'oint-1.34.0_ru-x86_64.AppImage', - en: 'oint-1.34.0_en-x86_64.AppImage', + ru: 'oint-2.0.0_ru-x86_64.AppImage', + en: 'oint-2.0.0_en-x86_64.AppImage', }, desc: 'Единый исполняемый файл CLI формата AppImage', }, @@ -84,16 +84,16 @@ const DownloadPage = () => { { name: 'Пакет oint (.ospx)', files: { - ru: 'oint-1.34.0_ru.ospx', - en: 'oint-1.34.0_en.ospx', + ru: 'oint-2.0.0_ru.ospx', + en: 'oint-2.0.0_en.ospx', }, desc: 'Пакет библиотеки для OneScript', }, { name: 'Пакет oint-cli (.ospx)', files: { - ru: 'oint-cli-1.34.0_ru.ospx', - en: 'oint-cli-1.34.0_en.ospx', + ru: 'oint-cli-2.0.0_ru.ospx', + en: 'oint-cli-2.0.0_en.ospx', }, desc: 'Пакет CLI-приложения для OneScript', }, @@ -155,7 +155,7 @@ const DownloadPage = () => { Скачать последнюю версию

- Текущая версия: 1.34.0 | Выберите подходящий язык и вариант поставки + Текущая версия: 2.0.0 | Выберите подходящий язык и вариант поставки

diff --git a/service/iss/en.iss b/service/iss/en.iss index 51ed887ab90..e37e8854231 100644 --- a/service/iss/en.iss +++ b/service/iss/en.iss @@ -1,5 +1,5 @@ #define MyAppName "OInt" -#define MyAppVersion "1.34.0" +#define MyAppVersion "2.0.0" #define MyAppPublisher "bayselonarrend" #define MyAppURL "https://github.com/Bayselonarrend/OpenIntegrations" #define MyAppExeName "oint.bat" diff --git a/service/iss/ru.iss b/service/iss/ru.iss index 3e4a8b5072e..eaf58c456b1 100644 --- a/service/iss/ru.iss +++ b/service/iss/ru.iss @@ -1,5 +1,5 @@ #define MyAppName "OInt" -#define MyAppVersion "1.34.0" +#define MyAppVersion "2.0.0" #define MyAppPublisher "bayselonarrend" #define MyAppURL "https://github.com/Bayselonarrend/OpenIntegrations" #define MyAppExeName "oint.bat" diff --git a/service/templates/jenkins/cli_test_deb.txt b/service/templates/jenkins/cli_test_deb.txt index e2090804e29..6af5691f4f5 100644 --- a/service/templates/jenkins/cli_test_deb.txt +++ b/service/templates/jenkins/cli_test_deb.txt @@ -35,7 +35,7 @@ pipeline { steps { script { // Скачиваем новый deb-пакет oint - sh 'wget -O oint_1.34.0_all_%1.deb https://jenkins.openintegrations.dev/job/OpiBuild/job/OpiRelease/lastSuccessfulBuild/artifact/1.34.0/oint_1.34.0_all_%1.deb ' + sh 'wget -O oint_2.0.0_all_%1.deb https://jenkins.openintegrations.dev/job/OpiBuild/job/OpiRelease/lastSuccessfulBuild/artifact/2.0.0/oint_2.0.0_all_%1.deb ' } } } @@ -43,14 +43,14 @@ pipeline { stage('Install oint package') { steps { script { - sh 'dpkg -i oint_1.34.0_all_%1.deb' + sh 'dpkg -i oint_2.0.0_all_%1.deb' } } } stage('Prepare'){ steps{ - sh 'cd ./src/%1/OInt && opm build && opm install oint-1.34.0.ospx && rm oint-1.34.0.ospx' + sh 'cd ./src/%1/OInt && opm build && opm install oint-2.0.0.ospx && rm oint-2.0.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { sh 'gpg --quiet --batch --yes --decrypt --passphrase="$GPGKEY" --output ./data.json ./data.json.gpg' } diff --git a/service/templates/jenkins/cli_test_rpm.txt b/service/templates/jenkins/cli_test_rpm.txt index cac8f6aad9c..f8f27e4e138 100644 --- a/service/templates/jenkins/cli_test_rpm.txt +++ b/service/templates/jenkins/cli_test_rpm.txt @@ -34,7 +34,7 @@ pipeline { steps { script { // Скачиваем новый rpm-пакет oint - sh 'wget -O oint-1.34.0-1.noarch_%1.rpm https://jenkins.openintegrations.dev/job/OpiBuild/job/OpiRelease/lastSuccessfulBuild/artifact/1.34.0/oint-1.34.0-1.noarch_%1.rpm ' + sh 'wget -O oint-2.0.0-1.noarch_%1.rpm https://jenkins.openintegrations.dev/job/OpiBuild/job/OpiRelease/lastSuccessfulBuild/artifact/2.0.0/oint-2.0.0-1.noarch_%1.rpm ' } } } @@ -43,14 +43,14 @@ pipeline { steps { script { // Устанавливаем скаченный пакет - sh 'rpm -ivh --replacepkgs oint-1.34.0-1.noarch_%1.rpm' + sh 'rpm -ivh --replacepkgs oint-2.0.0-1.noarch_%1.rpm' } } } stage('Prepare'){ steps{ - sh 'cd ./src/%1/OInt && opm build && opm install oint-1.34.0.ospx && rm oint-1.34.0.ospx' + sh 'cd ./src/%1/OInt && opm build && opm install oint-2.0.0.ospx && rm oint-2.0.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { sh 'gpg --quiet --batch --yes --decrypt --passphrase="$GPGKEY" --output ./data.json ./data.json.gpg' } diff --git a/service/templates/jenkins/cli_test_windows.txt b/service/templates/jenkins/cli_test_windows.txt index 62bf812242c..99fa7cfdf66 100644 --- a/service/templates/jenkins/cli_test_windows.txt +++ b/service/templates/jenkins/cli_test_windows.txt @@ -23,7 +23,7 @@ pipeline { stage('Decrypt Data') { steps { - powershell encoding: 'UTF-8', script:'cd ./src/%1/OInt; opm build; opm install oint-1.34.0.ospx; del oint-1.34.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/%1/OInt; opm build; opm install oint-2.0.0.ospx; del oint-2.0.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'gpg --quiet --batch --yes --decrypt --passphrase="%%GPGKEY%%" --output ./data.json ./data.json.gpg' } @@ -90,7 +90,7 @@ pipeline { stage('Download Installer') { steps { powershell encoding: 'UTF-8', script: ''' - $url = "https://jenkins.openintegrations.dev/job/OpiBuild/job/OpiRelease/lastSuccessfulBuild/artifact/1.34.0/oint_1.34.0_installer_%1.exe " + $url = "https://jenkins.openintegrations.dev/job/OpiBuild/job/OpiRelease/lastSuccessfulBuild/artifact/2.0.0/oint_2.0.0_installer_%1.exe " $output = "$env:USERPROFILE\\Downloads\\oint_installer.exe" Invoke-WebRequest -Uri $url -OutFile $output Write-Host "Инсталлер скачан в: $output" diff --git a/service/templates/jenkins/os_test_linux.txt b/service/templates/jenkins/os_test_linux.txt index 3f982f2c68d..8da49a7f0a9 100644 --- a/service/templates/jenkins/os_test_linux.txt +++ b/service/templates/jenkins/os_test_linux.txt @@ -60,7 +60,7 @@ pipeline { stage('Prepare'){ steps{ - sh 'cd ./src/%1/OInt && opm build && opm install oint-1.34.0.ospx && rm oint-1.34.0.ospx' + sh 'cd ./src/%1/OInt && opm build && opm install oint-2.0.0.ospx && rm oint-2.0.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { sh 'gpg --quiet --batch --yes --decrypt --passphrase="$GPGKEY" --output ./data.json ./data.json.gpg' } diff --git a/service/templates/jenkins/os_test_windows.txt b/service/templates/jenkins/os_test_windows.txt index 54d85696fea..bc624367852 100644 --- a/service/templates/jenkins/os_test_windows.txt +++ b/service/templates/jenkins/os_test_windows.txt @@ -57,7 +57,7 @@ pipeline { } stage('Build OInt from source and decrypt secret data'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/%1/OInt; opm build; opm install oint-1.34.0.ospx; del oint-1.34.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/%1/OInt; opm build; opm install oint-2.0.0.ospx; del oint-2.0.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'gpg --quiet --batch --yes --decrypt --passphrase="%%GPGKEY%%" --output ./data.json ./data.json.gpg' } diff --git a/src/en/OInt/packagedef b/src/en/OInt/packagedef index f3c8866b77f..06c7bb97ba4 100644 --- a/src/en/OInt/packagedef +++ b/src/en/OInt/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint") - .Версия("1.34.0") + .Версия("2.0.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("Открытый пакет интеграций с популярными API") diff --git a/src/en/OInt/tools/main/Modules/internal/Modules/OPI_Tools.os b/src/en/OInt/tools/main/Modules/internal/Modules/OPI_Tools.os index 0abb44b1a50..f1b8e01c6f7 100644 --- a/src/en/OInt/tools/main/Modules/internal/Modules/OPI_Tools.os +++ b/src/en/OInt/tools/main/Modules/internal/Modules/OPI_Tools.os @@ -1132,7 +1132,7 @@ Function GetLastBuildHashSum() Export EndFunction Function OPIVersion() Export - Return "1.34.0"; + Return "2.0.0"; EndFunction Function OPILanguage() Export diff --git a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl index a050bbfe20f..0640944f48a 100644 --- a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl @@ -1134,7 +1134,7 @@ Function GetLastBuildHashSum() Export EndFunction Function OPIVersion() Export - Return "1.34.0"; + Return "2.0.0"; EndFunction Function OPILanguage() Export diff --git a/src/en/OPI/src/Configuration/Configuration.mdo b/src/en/OPI/src/Configuration/Configuration.mdo index ca5be8ff0ea..6a4c479196b 100644 --- a/src/en/OPI/src/Configuration/Configuration.mdo +++ b/src/en/OPI/src/Configuration/Configuration.mdo @@ -26,7 +26,7 @@ PersonalComputer English https://github.com/Bayselonarrend - 1.34.0 + 2.0.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/data/Classes/index/lib.json b/src/en/cli/data/Classes/index/lib.json index b84e68ce323..179da91040d 100644 --- a/src/en/cli/data/Classes/index/lib.json +++ b/src/en/cli/data/Classes/index/lib.json @@ -1,5 +1,5 @@ { - "version": "1.34.0", + "version": "2.0.0", "modules": { "tools": "Utils", "airtable": "OPI_Airtable", diff --git a/src/en/cli/packagedef b/src/en/cli/packagedef index 73c6ffd88b3..7a191960a2a 100644 --- a/src/en/cli/packagedef +++ b/src/en/cli/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint-cli") - .Версия("1.34.0") + .Версия("2.0.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("OpenIntegrations-based CLI tool") @@ -11,5 +11,5 @@ .ВключитьФайл("env") .ВключитьФайл("lib.config") .ВключитьФайл(".versionhash") - .ЗависитОт("oint", "1.34.0") + .ЗависитОт("oint", "2.0.0") .ИсполняемыйФайл("core/Classes/app.os", "oint") diff --git a/src/ru/OInt/packagedef b/src/ru/OInt/packagedef index f3c8866b77f..06c7bb97ba4 100644 --- a/src/ru/OInt/packagedef +++ b/src/ru/OInt/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint") - .Версия("1.34.0") + .Версия("2.0.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("Открытый пакет интеграций с популярными API") diff --git a/src/ru/OInt/tools/main/Modules/internal/Modules/OPI_Инструменты.os b/src/ru/OInt/tools/main/Modules/internal/Modules/OPI_Инструменты.os index 960c928d1ad..1db1b5f791c 100644 --- a/src/ru/OInt/tools/main/Modules/internal/Modules/OPI_Инструменты.os +++ b/src/ru/OInt/tools/main/Modules/internal/Modules/OPI_Инструменты.os @@ -1132,7 +1132,7 @@ КонецФункции Функция ВерсияОПИ() Экспорт - Возврат "1.34.0"; + Возврат "2.0.0"; КонецФункции Функция ЯзыкОПИ() Экспорт diff --git a/src/ru/OPI/src/CommonModules/OPI_Инструменты/Module.bsl b/src/ru/OPI/src/CommonModules/OPI_Инструменты/Module.bsl index 886b2f5d795..118c58a6d07 100644 --- a/src/ru/OPI/src/CommonModules/OPI_Инструменты/Module.bsl +++ b/src/ru/OPI/src/CommonModules/OPI_Инструменты/Module.bsl @@ -1134,7 +1134,7 @@ КонецФункции Функция ВерсияОПИ() Экспорт - Возврат "1.34.0"; + Возврат "2.0.0"; КонецФункции Функция ЯзыкОПИ() Экспорт diff --git a/src/ru/OPI/src/Configuration/Configuration.mdo b/src/ru/OPI/src/Configuration/Configuration.mdo index e90e3827803..61bc5711c77 100644 --- a/src/ru/OPI/src/Configuration/Configuration.mdo +++ b/src/ru/OPI/src/Configuration/Configuration.mdo @@ -26,7 +26,7 @@ PersonalComputer Russian https://github.com/Bayselonarrend - 1.34.0 + 2.0.0 ru Открытый пакет интеграций - набор библиотек для интеграции с некоторыми популярными API для 1C:Enterprise. Он состоит из общих модулей, каждый из которых отвечает за свой API, а также нескольких модулей-инструментов, общих для всех. diff --git a/src/ru/cli/data/Classes/index/lib.json b/src/ru/cli/data/Classes/index/lib.json index b84e68ce323..179da91040d 100644 --- a/src/ru/cli/data/Classes/index/lib.json +++ b/src/ru/cli/data/Classes/index/lib.json @@ -1,5 +1,5 @@ { - "version": "1.34.0", + "version": "2.0.0", "modules": { "tools": "Utils", "airtable": "OPI_Airtable", diff --git a/src/ru/cli/packagedef b/src/ru/cli/packagedef index 73c6ffd88b3..7a191960a2a 100644 --- a/src/ru/cli/packagedef +++ b/src/ru/cli/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint-cli") - .Версия("1.34.0") + .Версия("2.0.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("OpenIntegrations-based CLI tool") @@ -11,5 +11,5 @@ .ВключитьФайл("env") .ВключитьФайл("lib.config") .ВключитьФайл(".versionhash") - .ЗависитОт("oint", "1.34.0") + .ЗависитОт("oint", "2.0.0") .ИсполняемыйФайл("core/Classes/app.os", "oint")