From 57a999611bc906239f09fa0b9d592c49724f13d2 Mon Sep 17 00:00:00 2001 From: Denis Averin Date: Tue, 14 Jan 2025 17:01:14 +0700 Subject: [PATCH 1/8] Update Android --- codegen/Templates/android/build.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/codegen/Templates/android/build.mustache b/codegen/Templates/android/build.mustache index 1503f5d..1f1e200 100644 --- a/codegen/Templates/android/build.mustache +++ b/codegen/Templates/android/build.mustache @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.3.2' apply false - id 'com.android.library' version '8.3.2' apply false - id 'org.jetbrains.kotlin.android' version '1.9.0' apply false + id 'com.android.application' version '8.7.3' apply false + id 'com.android.library' version '8.7.3' apply false + id 'org.jetbrains.kotlin.android' version '2.1.0' apply false } -ext.kotlin_version = '1.9.0' +ext.kotlin_version = '2.1.0' From 7a7785979d1ac33ad842b59cfee614a855c7a721 Mon Sep 17 00:00:00 2001 From: Denis Averin Date: Tue, 14 Jan 2025 17:03:15 +0700 Subject: [PATCH 2/8] Update Java --- codegen/Templates/java/ApiClient.mustache | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/codegen/Templates/java/ApiClient.mustache b/codegen/Templates/java/ApiClient.mustache index dbde05c..88cff34 100644 --- a/codegen/Templates/java/ApiClient.mustache +++ b/codegen/Templates/java/ApiClient.mustache @@ -696,7 +696,7 @@ public class ApiClient { if (response.body() == null) { throw new ApiException(response.message(), response.code()); } - + ApiErrorResponse errorResponse; try { errorResponse = deserialize(response, ApiErrorResponse.class); @@ -980,6 +980,10 @@ public class ApiClient { .build(); Response response = httpClient.newCall(request).execute(); + if (response.code() != 200) { + throw new ApiException( + "Error fetching token: " + response.message(), response.code()); + } GetAccessTokenResult result = json.deserialize(response.body().string(), GetAccessTokenResult.class); setAccessToken(result.access_token); From 15303dba1eb4f2aa18215ace7a423dbc7bf63a7f Mon Sep 17 00:00:00 2001 From: Denis Averin Date: Tue, 14 Jan 2025 17:05:26 +0700 Subject: [PATCH 3/8] Update Python --- codegen/Templates/python/rest.mustache | 2 -- 1 file changed, 2 deletions(-) diff --git a/codegen/Templates/python/rest.mustache b/codegen/Templates/python/rest.mustache index 31120c0..c5656aa 100644 --- a/codegen/Templates/python/rest.mustache +++ b/codegen/Templates/python/rest.mustache @@ -37,7 +37,6 @@ class RESTResponse(io.IOBase): class RESTClientObject(object): - def __init__(self, configuration, pools_size=4, maxsize=None): # urllib3.PoolManager will pass all kw parameters to connectionpool # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75 # noqa: E501 @@ -290,7 +289,6 @@ class RESTClientObject(object): class ApiException(Exception): - def __init__(self, status=0, reason=None, http_resp=None): # type: (int, str, RESTResponse) -> None if http_resp: From 8877b92fe0eaf9a9aa529d9eef2234991f3c56ee Mon Sep 17 00:00:00 2001 From: Denis Averin Date: Tue, 14 Jan 2025 17:28:22 +0700 Subject: [PATCH 4/8] Update Copyright year to 2025 --- LICENSE | 2 +- codegen/Templates/android/licenseInfo.mustache | 2 +- codegen/Templates/csharp/Project.mustache | 2 +- codegen/Templates/csharp/partial_header.mustache | 2 +- codegen/Templates/csharp/requestModel.mustache | 2 +- codegen/Templates/go/partial_header.mustache | 2 +- codegen/Templates/java/api.mustache | 2 +- codegen/Templates/java/licenseInfo.mustache | 2 +- codegen/Templates/nodejs/licenseInfo.mustache | 2 +- codegen/Templates/php/licenseInfo.mustache | 2 +- codegen/Templates/php/requestModel.mustache | 2 +- codegen/Templates/python/partial_header.mustache | 2 +- scripts/grep-year-in-git.bash | 6 ++++++ 13 files changed, 18 insertions(+), 12 deletions(-) create mode 100755 scripts/grep-year-in-git.bash diff --git a/LICENSE b/LICENSE index efcf55b..1b8abcb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 Aspose Pty Ltd +Copyright (c) 2025 Aspose Pty Ltd Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/codegen/Templates/android/licenseInfo.mustache b/codegen/Templates/android/licenseInfo.mustache index a1b6779..5f598cc 100644 --- a/codegen/Templates/android/licenseInfo.mustache +++ b/codegen/Templates/android/licenseInfo.mustache @@ -1,7 +1,7 @@ /* * -------------------------------------------------------------------------------- * - * Copyright (c) 2024 Aspose.BarCode for Cloud + * Copyright (c) 2025 Aspose.BarCode for Cloud * * * Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/codegen/Templates/csharp/Project.mustache b/codegen/Templates/csharp/Project.mustache index 3a6c909..b9b944b 100644 --- a/codegen/Templates/csharp/Project.mustache +++ b/codegen/Templates/csharp/Project.mustache @@ -19,7 +19,7 @@ Aspose.Barcode for Cloud allows you to control all aspects of the image and barc true embedded Barcode Scan Recognize Generate QR DataMatrix AustraliaPost VIN MSI Aztec ISBN OPC Postnet Aspose Aspose.BarCode Aspose.BarCode-Cloud EAN13 ISSN PZN SingaporePost UPCA UPCE Code11 Code128 Code32 DotCode EAN14 EAN8 GS1DataMatrix - © Aspose Pty Ltd 2001-2024. All Rights Reserved. + © Aspose Pty Ltd 2001-2025. All Rights Reserved. true Aspose.BarCode-Cloud Aspose.BarCode Cloud SDK for .NET diff --git a/codegen/Templates/csharp/partial_header.mustache b/codegen/Templates/csharp/partial_header.mustache index 1fc781b..c41d2b8 100644 --- a/codegen/Templates/csharp/partial_header.mustache +++ b/codegen/Templates/csharp/partial_header.mustache @@ -1,6 +1,6 @@ // -------------------------------------------------------------------------------------------------------------------- // -// Copyright (c) 2024 Aspose.BarCode for Cloud +// Copyright (c) 2025 Aspose.BarCode for Cloud // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/codegen/Templates/csharp/requestModel.mustache b/codegen/Templates/csharp/requestModel.mustache index 2fa2e19..a9fae8d 100644 --- a/codegen/Templates/csharp/requestModel.mustache +++ b/codegen/Templates/csharp/requestModel.mustache @@ -2,7 +2,7 @@ {{#operation}} // -------------------------------------------------------------------------------------------------------------------- // -// Copyright (c) 2024 Aspose.BarCode for Cloud +// Copyright (c) 2025 Aspose.BarCode for Cloud // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/codegen/Templates/go/partial_header.mustache b/codegen/Templates/go/partial_header.mustache index ece8937..bb9883e 100644 --- a/codegen/Templates/go/partial_header.mustache +++ b/codegen/Templates/go/partial_header.mustache @@ -1,7 +1,7 @@ /* * MIT License - * Copyright (c) 2024 Aspose Pty Ltd + * Copyright (c) 2025 Aspose Pty Ltd * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/codegen/Templates/java/api.mustache b/codegen/Templates/java/api.mustache index 7e15d74..ff739ca 100644 --- a/codegen/Templates/java/api.mustache +++ b/codegen/Templates/java/api.mustache @@ -269,7 +269,7 @@ public class {{classname}} { {{#operation}} // -------------------------------------------------------------------------------------------------------------------- // -// Copyright (c) 2024 Aspose.BarCode for Cloud +// Copyright (c) 2025 Aspose.BarCode for Cloud // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/codegen/Templates/java/licenseInfo.mustache b/codegen/Templates/java/licenseInfo.mustache index 29c67f1..95e5642 100644 --- a/codegen/Templates/java/licenseInfo.mustache +++ b/codegen/Templates/java/licenseInfo.mustache @@ -1,6 +1,6 @@ // -------------------------------------------------------------------------------------------------------------------- // -// Copyright (c) 2024 Aspose.BarCode for Cloud +// Copyright (c) 2025 Aspose.BarCode for Cloud // // // Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/codegen/Templates/nodejs/licenseInfo.mustache b/codegen/Templates/nodejs/licenseInfo.mustache index 395bb79..913f983 100644 --- a/codegen/Templates/nodejs/licenseInfo.mustache +++ b/codegen/Templates/nodejs/licenseInfo.mustache @@ -1,7 +1,7 @@ /* * MIT License -* Copyright (c) 2024 Aspose Pty Ltd +* Copyright (c) 2025 Aspose Pty Ltd * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/codegen/Templates/php/licenseInfo.mustache b/codegen/Templates/php/licenseInfo.mustache index 3fd57cc..1c1323a 100644 --- a/codegen/Templates/php/licenseInfo.mustache +++ b/codegen/Templates/php/licenseInfo.mustache @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------------------------------------------------- * - * Copyright (c) 2024 Aspose Pty Ltd + * Copyright (c) 2025 Aspose Pty Ltd * * * Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/codegen/Templates/php/requestModel.mustache b/codegen/Templates/php/requestModel.mustache index 103666f..666587d 100644 --- a/codegen/Templates/php/requestModel.mustache +++ b/codegen/Templates/php/requestModel.mustache @@ -3,7 +3,7 @@ /** * -------------------------------------------------------------------------------------------------------------------- * - * Copyright (c) 2024 Aspose Pty Ltd + * Copyright (c) 2025 Aspose Pty Ltd * * -------------------------------------------------------------------------------------------------------------------- */ diff --git a/codegen/Templates/python/partial_header.mustache b/codegen/Templates/python/partial_header.mustache index bd430c4..1fadf15 100644 --- a/codegen/Templates/python/partial_header.mustache +++ b/codegen/Templates/python/partial_header.mustache @@ -1,6 +1,6 @@ """ - Copyright (c) 2024 Aspose.BarCode for Cloud + Copyright (c) 2025 Aspose.BarCode for Cloud Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/scripts/grep-year-in-git.bash b/scripts/grep-year-in-git.bash new file mode 100755 index 0000000..057b02c --- /dev/null +++ b/scripts/grep-year-in-git.bash @@ -0,0 +1,6 @@ +#!/bin/bash +set -euo pipefail + +year=$1 + +git ls-files --recurse-submodules | xargs grep -FHn "${year}" From 04827097129d183e66ee2849a398cb7c3dee2717 Mon Sep 17 00:00:00 2001 From: Denis Averin Date: Tue, 14 Jan 2025 17:35:15 +0700 Subject: [PATCH 5/8] Update submodules --- submodules/android | 2 +- submodules/dart | 2 +- submodules/dotnet | 2 +- submodules/go | 2 +- submodules/java | 2 +- submodules/node | 2 +- submodules/php | 2 +- submodules/python | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/submodules/android b/submodules/android index eda7fb7..2f140c8 160000 --- a/submodules/android +++ b/submodules/android @@ -1 +1 @@ -Subproject commit eda7fb75fd7f305e42372ccb3e80017700b8fe05 +Subproject commit 2f140c8cf256d61d32a98d006f704f9cbfdc706e diff --git a/submodules/dart b/submodules/dart index 8757f38..ca27704 160000 --- a/submodules/dart +++ b/submodules/dart @@ -1 +1 @@ -Subproject commit 8757f38e5f9afa0813a061c9961a69be50f3ac71 +Subproject commit ca277046922574e565d004cb62c7c701f3566017 diff --git a/submodules/dotnet b/submodules/dotnet index f4d8bd5..cf882eb 160000 --- a/submodules/dotnet +++ b/submodules/dotnet @@ -1 +1 @@ -Subproject commit f4d8bd55bcd8a4220fb2b38ed92ad8334ea5e7d0 +Subproject commit cf882ebd103640e77cbba3ae4cd018651e1397e8 diff --git a/submodules/go b/submodules/go index ceafb24..d40ae45 160000 --- a/submodules/go +++ b/submodules/go @@ -1 +1 @@ -Subproject commit ceafb24493bc6d8fc645edacc334b580b48ec0e1 +Subproject commit d40ae45ffa6824e6f7eb5e4b5a1be259fdef3ce3 diff --git a/submodules/java b/submodules/java index 3bb9772..c75b702 160000 --- a/submodules/java +++ b/submodules/java @@ -1 +1 @@ -Subproject commit 3bb9772093f7710faee988009b398aa65a70e4a0 +Subproject commit c75b702c85ed8fc9220e85e4f4c2b448a7324d40 diff --git a/submodules/node b/submodules/node index 6ea6928..20b81f8 160000 --- a/submodules/node +++ b/submodules/node @@ -1 +1 @@ -Subproject commit 6ea6928c729c9e86ac28395a2088f311af82bb72 +Subproject commit 20b81f816aace53a46ae62c13ee930cd44751173 diff --git a/submodules/php b/submodules/php index 73e1e03..e7b0613 160000 --- a/submodules/php +++ b/submodules/php @@ -1 +1 @@ -Subproject commit 73e1e03f2778cb5de33afcced815026e3de43e95 +Subproject commit e7b061362df616e4b435fa1d3d931eee59419d76 diff --git a/submodules/python b/submodules/python index 0f95866..bbcf9f6 160000 --- a/submodules/python +++ b/submodules/python @@ -1 +1 @@ -Subproject commit 0f9586696ab25ec6c36a53eefceb835b3fa64a60 +Subproject commit bbcf9f6cae6730ea8df45cff3126c90fefbb9999 From 01fd144eebcff19226e41938241d4bb41364fe6a Mon Sep 17 00:00:00 2001 From: Denis Averin Date: Sat, 31 May 2025 17:00:17 +0700 Subject: [PATCH 6/8] Prepared v3 release 24.13 --- .github/workflows/check-codegen.yml | 4 ++-- codegen/Templates/dart/pubspec.mustache | 2 +- codegen/Templates/java/ApiClient.mustache | 5 ++++- codegen/Templates/java/pom.mustache | 6 +++--- codegen/Templates/nodejs/package.mustache | 8 ++++---- codegen/Templates/python/README.mustache | 2 +- codegen/Templates/python/setup.mustache | 2 -- codegen/Templates/python/tox.mustache | 4 ++-- codegen/config-android.json | 2 +- codegen/config-dart.json | 2 +- codegen/config-go.json | 2 +- codegen/config-java.json | 2 +- codegen/config-php.json | 2 +- codegen/config-python.json | 2 +- codegen/config.json | 4 ++-- scripts/start-release.bash | 13 +++++-------- scripts/switch-submodules-to-v3.bash | 19 +++++++++++++++++++ scripts/switch_all_submodules_to_main.bash | 15 --------------- submodules/go | 2 +- submodules/node | 2 +- 20 files changed, 51 insertions(+), 49 deletions(-) create mode 100755 scripts/switch-submodules-to-v3.bash delete mode 100755 scripts/switch_all_submodules_to_main.bash diff --git a/.github/workflows/check-codegen.yml b/.github/workflows/check-codegen.yml index bd1cbab..61b1b64 100644 --- a/.github/workflows/check-codegen.yml +++ b/.github/workflows/check-codegen.yml @@ -4,9 +4,9 @@ name: Check pull request # events but only for the main branch on: push: - branches: [main] + branches: [ v3 ] pull_request: - branches: [main] + branches: [ v3 ] jobs: check-submodules: diff --git a/codegen/Templates/dart/pubspec.mustache b/codegen/Templates/dart/pubspec.mustache index dd22cde..dbf35f4 100644 --- a/codegen/Templates/dart/pubspec.mustache +++ b/codegen/Templates/dart/pubspec.mustache @@ -17,5 +17,5 @@ dependencies: http: '>=0.13.0 <2.0.0' dev_dependencies: - lints: ^5.1.1 + lints: ^6.0.0 test: ^1.25.1 diff --git a/codegen/Templates/java/ApiClient.mustache b/codegen/Templates/java/ApiClient.mustache index 88cff34..1ad47b7 100644 --- a/codegen/Templates/java/ApiClient.mustache +++ b/codegen/Templates/java/ApiClient.mustache @@ -705,7 +705,10 @@ public class ApiClient { response.message(), e, response.code(), response.headers().toMultimap()); } - throw new ApiException(response.message(), response.code(), errorResponse); + throw new ApiException( + response.message().isEmpty() ? String.valueOf(response.code()) : response.message(), + response.code(), + errorResponse); } /** diff --git a/codegen/Templates/java/pom.mustache b/codegen/Templates/java/pom.mustache index 1c7e6ac..a055fff 100644 --- a/codegen/Templates/java/pom.mustache +++ b/codegen/Templates/java/pom.mustache @@ -245,14 +245,14 @@ ${java.version} 1.9.0 {{! Check version compatibility with gson-fire }} - 2.11.0 - 1.6.14 + 2.13.1 + 1.6.16 4.12.0 {{#joda}} 2.9.9 {{/joda}} {{#threetenbp}} - 1.7.0 + 1.7.1 {{/threetenbp}} 1.0.0 4.13.2 diff --git a/codegen/Templates/nodejs/package.mustache b/codegen/Templates/nodejs/package.mustache index 69279a3..5a6144f 100644 --- a/codegen/Templates/nodejs/package.mustache +++ b/codegen/Templates/nodejs/package.mustache @@ -149,13 +149,13 @@ "devDependencies": { "@types/uuid": "^10.0.0", "dts-cli": "^2.0.5", - "eslint-config-prettier": "^9.1.0", - "eslint-plugin-prettier": "^5.2.1", + "eslint-config-prettier": "^10.1.5", + "eslint-plugin-prettier": "^5.4.1", "npm-check-updates": "^16.14.20", - "prettier": "^3.4.2", + "prettier": "^3.5.3", "ts-jest": "^29.1.3", "tslib": "^2.8.1", - "uuid": "^11.0.3" + "uuid": "^11.1.0" }, "bugs": { "url": "https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-node/issues" diff --git a/codegen/Templates/python/README.mustache b/codegen/Templates/python/README.mustache index 6011df6..1dc43ac 100644 --- a/codegen/Templates/python/README.mustache +++ b/codegen/Templates/python/README.mustache @@ -21,7 +21,7 @@ This repository contains Aspose.BarCode Cloud SDK for Python source code. This S Supported Python versions: -- Python 3.6+ +- Python 3.8+ To use these SDKs, you will need Client Id and Client Secret which can be looked up at [Aspose Cloud Dashboard](https://dashboard.aspose.cloud/applications) (free registration in Aspose Cloud is required for this). diff --git a/codegen/Templates/python/setup.mustache b/codegen/Templates/python/setup.mustache index b4b2ef8..bdd6e31 100644 --- a/codegen/Templates/python/setup.mustache +++ b/codegen/Templates/python/setup.mustache @@ -44,8 +44,6 @@ setup( "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", diff --git a/codegen/Templates/python/tox.mustache b/codegen/Templates/python/tox.mustache index 9f1e789..1a4f6c8 100644 --- a/codegen/Templates/python/tox.mustache +++ b/codegen/Templates/python/tox.mustache @@ -1,8 +1,8 @@ ; Use tox version 3.x ; Run particular env: -; python -m tox -e 3.6 +; python -m tox -e 3.8 [tox] -envlist = 3.6, 3.12 +envlist = 3.8, 3.13 [testenv] passenv = TEST_CONFIGURATION_ACCESS_TOKEN diff --git a/codegen/config-android.json b/codegen/config-android.json index b6bc1b7..e0257b5 100644 --- a/codegen/config-android.json +++ b/codegen/config-android.json @@ -4,7 +4,7 @@ "androidSdkVersion": "33", "apiPackage": "com.aspose.barcode.cloud.demo_app", "artifactId": "Android Application for Barcode Processing in the Cloud via REST API", - "artifactVersion": "24.12.0", + "artifactVersion": "24.13.0", "groupId": "com.aspose", "invokerPackage": "com.aspose.barcode.cloud.demo_app", "modelPackage": "com.aspose.barcode.cloud.demo_app.model" diff --git a/codegen/config-dart.json b/codegen/config-dart.json index 4da1ad8..f11a21b 100644 --- a/codegen/config-dart.json +++ b/codegen/config-dart.json @@ -3,6 +3,6 @@ "browserClient": false, "pubDescription": "This SDK allows you to work with Aspose.BarCode for Cloud REST APIs in your Dart or Flutter applications quickly and easily", "pubName": "aspose_barcode_cloud", - "pubVersion": "1.24.12", + "pubVersion": "1.24.13", "useEnumExtension": true } \ No newline at end of file diff --git a/codegen/config-go.json b/codegen/config-go.json index b576922..607e75c 100644 --- a/codegen/config-go.json +++ b/codegen/config-go.json @@ -1,4 +1,4 @@ { "packageName": "barcode", - "packageVersion": "1.2412.0" + "packageVersion": "1.2413.0" } \ No newline at end of file diff --git a/codegen/config-java.json b/codegen/config-java.json index 6bb5387..88d224f 100644 --- a/codegen/config-java.json +++ b/codegen/config-java.json @@ -3,7 +3,7 @@ "artifactDescription": "Aspose.BarCode Cloud SDK for Java", "artifactId": "aspose-barcode-cloud", "artifactUrl": "https://www.aspose.cloud", - "artifactVersion": "24.12.0", + "artifactVersion": "24.13.0", "developerEmail": "denis.averin@aspose.com", "developerName": "Denis Averin", "developerOrganization": "Aspose", diff --git a/codegen/config-php.json b/codegen/config-php.json index 89ea906..54dd766 100644 --- a/codegen/config-php.json +++ b/codegen/config-php.json @@ -1,4 +1,4 @@ { - "artifactVersion": "24.12.0", + "artifactVersion": "24.13.0", "invokerPackage": "Aspose\\BarCode" } \ No newline at end of file diff --git a/codegen/config-python.json b/codegen/config-python.json index 17e7695..0ac120d 100644 --- a/codegen/config-python.json +++ b/codegen/config-python.json @@ -1,6 +1,6 @@ { "packageName": "aspose_barcode_cloud", "packageUrl": "https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-python", - "packageVersion": "24.12.0", + "packageVersion": "24.13.0", "projectName": "aspose-barcode-cloud" } \ No newline at end of file diff --git a/codegen/config.json b/codegen/config.json index 3eee350..b9a7aec 100644 --- a/codegen/config.json +++ b/codegen/config.json @@ -1,9 +1,9 @@ { "artifactVersion": "23.7.0", "npmName": "aspose-barcode-cloud-node", - "npmVersion": "24.12.0", + "npmVersion": "24.13.0", "packageName": "Aspose.BarCode.Cloud.Sdk", - "packageVersion": "24.12.0", + "packageVersion": "24.13.0", "supportsES6": true, "targetFramework": "netstandard2.0" } \ No newline at end of file diff --git a/scripts/start-release.bash b/scripts/start-release.bash index b8f55e1..dbc3a5a 100755 --- a/scripts/start-release.bash +++ b/scripts/start-release.bash @@ -7,12 +7,9 @@ which make || ( exit 1 ) -year=$(date +%y) -month=$(date +%-m) - -major=${1:-$year} -minor=${2:-$month} -branch_name="release-${major}.${minor}" +major="24" +minor="13" +branch_name="release-v3-${major}.${minor}" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" pushd "${SCRIPT_DIR}/.." @@ -20,8 +17,8 @@ pushd "${SCRIPT_DIR}/.." echo "Update Swagger specification..." ./scripts/update_swagger_spec.bash -echo "Switch to main all submodules for start new branch in the right place..." -./scripts/switch_all_submodules_to_main.bash +echo "Switch all submodules to v3 for start new branch in the right place..." +./scripts/switch-submodules-to-v3.bash echo "Switching to ${branch_name}" git switch --create "${branch_name}" || git switch "${branch_name}" diff --git a/scripts/switch-submodules-to-v3.bash b/scripts/switch-submodules-to-v3.bash new file mode 100755 index 0000000..e948daf --- /dev/null +++ b/scripts/switch-submodules-to-v3.bash @@ -0,0 +1,19 @@ +#!/bin/bash + +set -euo pipefail + +pushd "$(dirname "$0")/../submodules" + +for d in */ ; do + pushd "$d" + + branch="v3" + if [ "$d" = "go/" ]; then + branch="v1" + fi + (git fetch --prune && git switch "$branch" && git pull --ff-only) || true + + popd >/dev/null +done + +popd >/dev/null diff --git a/scripts/switch_all_submodules_to_main.bash b/scripts/switch_all_submodules_to_main.bash deleted file mode 100755 index ebeea87..0000000 --- a/scripts/switch_all_submodules_to_main.bash +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -pushd "$(dirname "$0")/../submodules" - -for d in */ ; do - pushd "$d" - - (git fetch --prune && git switch main && git pull --ff-only) || true - - popd >/dev/null -done - -popd >/dev/null diff --git a/submodules/go b/submodules/go index d40ae45..bcc291c 160000 --- a/submodules/go +++ b/submodules/go @@ -1 +1 @@ -Subproject commit d40ae45ffa6824e6f7eb5e4b5a1be259fdef3ce3 +Subproject commit bcc291c7cc369c2c381add2bc0a86c7bb0fff0a3 diff --git a/submodules/node b/submodules/node index 20b81f8..5b1c3a4 160000 --- a/submodules/node +++ b/submodules/node @@ -1 +1 @@ -Subproject commit 20b81f816aace53a46ae62c13ee930cd44751173 +Subproject commit 5b1c3a4d516f2b752343b96d659252f28dad9ec6 From 386f62b79e3aa4f8b3ba4fd4b170f411ed7308c6 Mon Sep 17 00:00:00 2001 From: Denis Averin Date: Sat, 31 May 2025 18:54:05 +0700 Subject: [PATCH 7/8] Update submodules --- scripts/switch-submodules-to-v3.bash | 5 ++++- submodules/android | 2 +- submodules/dart | 2 +- submodules/dotnet | 2 +- submodules/go | 2 +- submodules/java | 2 +- submodules/node | 2 +- submodules/php | 2 +- submodules/python | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/switch-submodules-to-v3.bash b/scripts/switch-submodules-to-v3.bash index e948daf..51f4928 100755 --- a/scripts/switch-submodules-to-v3.bash +++ b/scripts/switch-submodules-to-v3.bash @@ -8,8 +8,11 @@ for d in */ ; do pushd "$d" branch="v3" - if [ "$d" = "go/" ]; then + if [ "$d" = "dart/" ] || [ "$d" = "go/" ]; then branch="v1" + elif [ "$d" = "android/" ]; then + # Do not update Android to legacy v3 versions + branch="main" fi (git fetch --prune && git switch "$branch" && git pull --ff-only) || true diff --git a/submodules/android b/submodules/android index 2f140c8..12f026d 160000 --- a/submodules/android +++ b/submodules/android @@ -1 +1 @@ -Subproject commit 2f140c8cf256d61d32a98d006f704f9cbfdc706e +Subproject commit 12f026d1205e014207f0fe067e56f4f3e9db3a69 diff --git a/submodules/dart b/submodules/dart index ca27704..a4d2dcd 160000 --- a/submodules/dart +++ b/submodules/dart @@ -1 +1 @@ -Subproject commit ca277046922574e565d004cb62c7c701f3566017 +Subproject commit a4d2dcda8e66d8b2592701109d083ef6a0ec200e diff --git a/submodules/dotnet b/submodules/dotnet index cf882eb..e01535d 160000 --- a/submodules/dotnet +++ b/submodules/dotnet @@ -1 +1 @@ -Subproject commit cf882ebd103640e77cbba3ae4cd018651e1397e8 +Subproject commit e01535d846874bf2f4c61c19511c488440c578c9 diff --git a/submodules/go b/submodules/go index bcc291c..d101c18 160000 --- a/submodules/go +++ b/submodules/go @@ -1 +1 @@ -Subproject commit bcc291c7cc369c2c381add2bc0a86c7bb0fff0a3 +Subproject commit d101c18f747639622e2afd38d19ec1c423a2a168 diff --git a/submodules/java b/submodules/java index c75b702..45039a9 160000 --- a/submodules/java +++ b/submodules/java @@ -1 +1 @@ -Subproject commit c75b702c85ed8fc9220e85e4f4c2b448a7324d40 +Subproject commit 45039a9d889eced1ed07cdf183e809f21bb8523d diff --git a/submodules/node b/submodules/node index 5b1c3a4..92d122a 160000 --- a/submodules/node +++ b/submodules/node @@ -1 +1 @@ -Subproject commit 5b1c3a4d516f2b752343b96d659252f28dad9ec6 +Subproject commit 92d122a4270261c016bda884f8daf958edc5eb9a diff --git a/submodules/php b/submodules/php index e7b0613..2cb1743 160000 --- a/submodules/php +++ b/submodules/php @@ -1 +1 @@ -Subproject commit e7b061362df616e4b435fa1d3d931eee59419d76 +Subproject commit 2cb17436ef25c41d05891b42a78266531c7dfc67 diff --git a/submodules/python b/submodules/python index bbcf9f6..3cc1840 160000 --- a/submodules/python +++ b/submodules/python @@ -1 +1 @@ -Subproject commit bbcf9f6cae6730ea8df45cff3126c90fefbb9999 +Subproject commit 3cc1840398290bbd9e058abf0afc6b545ea9186c From 4ea9804d4ca2d05d598b2bb157658d1eb91aa93d Mon Sep 17 00:00:00 2001 From: Denis Averin Date: Sat, 31 May 2025 18:56:53 +0700 Subject: [PATCH 8/8] Check submodules with v3 --- .github/workflows/check-codegen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-codegen.yml b/.github/workflows/check-codegen.yml index 61b1b64..a4700cf 100644 --- a/.github/workflows/check-codegen.yml +++ b/.github/workflows/check-codegen.yml @@ -19,7 +19,7 @@ jobs: - name: Check all submodules up-to-date run: | - git submodule update --recursive --remote + ./scripts/switch-submodules-to-v3.bash git diff --exit-code check-swagger: