Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 23.11 #86

Merged
merged 6 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ deprecated: openapi

# Making all SDKs
.PHONY: sdk
sdk: android dart dotnet go java node php python
sdk:
./scripts/generate-all.bash

.PHONY: android
android:
Expand Down
2 changes: 1 addition & 1 deletion codegen/Templates/csharp/README.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Aspose.BarCode Cloud SDK for .NET provides cross-platform bindings for:

- .NET 5 and higher
- .NET Standard 2.0 and higher
- .NET Core 2.1 and higher
- .NET Core 3.1 and higher
- .NET Framework 4.6.2 and higher

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).
Expand Down
2 changes: 1 addition & 1 deletion codegen/Templates/csharp/TestProject.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion codegen/Templates/dart/pubspec.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ environment:
dependencies:
http: '>=0.13.0 <2.0.0'
dev_dependencies:
lints: ^2.1.1
lints: ^3.0.0
test: ^1.19.2
4 changes: 2 additions & 2 deletions codegen/Templates/java/ApiClient.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ public class ApiClient {
url.append("&");
}
String value = parameterToString(param.getValue());
url.append(escapeString(param.getName())).append("=").append(escapeString(value));
url.append(escapeString(param.getKey())).append("=").append(escapeString(value));
}
}
}
Expand All @@ -851,7 +851,7 @@ public class ApiClient {
}
String value = parameterToString(param.getValue());
// collection query parameter value already escaped as part of parameterToPairs
url.append(escapeString(param.getName())).append("=").append(value);
url.append(escapeString(param.getKey())).append("=").append(value);
}
}
}
Expand Down
44 changes: 5 additions & 39 deletions codegen/Templates/java/Pair.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,12 @@

package {{invokerPackage}};

/**
* Name-value pair.
*/
public class Pair {
private String name = "";
private String value = "";
import java.util.AbstractMap;

public Pair(String name, String value) {
setName(name);
setValue(value);
}

private void setName(String name) {
if (isNullOrEmpty(name)) {
return;
}

this.name = name;
}

private void setValue(String value) {
if (isNullOrEmpty(value)) {
return;
}

this.value = value;
}

public String getName() {
return this.name;
}

public String getValue() {
return this.value;
}
/** Key-value pair. */
public class Pair extends AbstractMap.SimpleImmutableEntry<String, String> {

private static boolean isNullOrEmpty(String arg) {
if (arg == null) {
return true;
}
return arg.trim().isEmpty();
public Pair(String key, String value) {
super(key, value);
}
}
6 changes: 4 additions & 2 deletions codegen/Templates/python/setup.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ VERSION = "{{packageVersion}}"
# prerequisite: setuptools
# http://pypi.python.org/pypi/setuptools

REQUIRES = ["certifi>=2017.4.17", "python-dateutil>=2.1", "six>=1.10", "urllib3 >= 1.21.1, <2.0"]

{{#asyncio}}
REQUIRES.append("aiohttp")
{{/asyncio}}
Expand All @@ -27,6 +25,9 @@ REQUIRES.append("tornado")
{{/tornado}}
here = os.path.abspath(os.path.dirname(__file__))

with open(os.path.join(here, "requirements.txt"), "rt") as f:
REQUIRES = list(map(str.strip, f.readlines()))

with open(os.path.join(here, "README.md"), "rt") as f:
long_description = f.read()

Expand All @@ -53,6 +54,7 @@ setup(
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
keywords=[
"Barcode-Scan",
Expand Down
2 changes: 1 addition & 1 deletion codegen/config-android.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "23.10.0",
"artifactVersion": "23.11.0",
"groupId": "com.aspose",
"invokerPackage": "com.aspose.barcode.cloud.demo_app",
"modelPackage": "com.aspose.barcode.cloud.demo_app.model"
Expand Down
2 changes: 1 addition & 1 deletion codegen/config-dart.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,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": "0.23.10",
"pubVersion": "0.23.11",
"useEnumExtension": true
}
2 changes: 1 addition & 1 deletion codegen/config-go.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"packageName": "barcode",
"packageVersion": "0.2310.0"
"packageVersion": "0.2311.0"
}
2 changes: 1 addition & 1 deletion codegen/config-java.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"artifactDescription": "Aspose.BarCode Cloud SDK for Java",
"artifactId": "aspose-barcode-cloud",
"artifactUrl": "https://www.aspose.cloud",
"artifactVersion": "23.10.0",
"artifactVersion": "23.11.0",
"developerEmail": "denis.averin@aspose.com",
"developerName": "Denis Averin",
"developerOrganization": "Aspose",
Expand Down
2 changes: 1 addition & 1 deletion codegen/config-php.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"artifactVersion": "23.10.0",
"artifactVersion": "23.11.0",
"invokerPackage": "Aspose\\BarCode"
}
2 changes: 1 addition & 1 deletion codegen/config-python.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packageName": "aspose_barcode_cloud",
"packageUrl": "https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-python",
"packageVersion": "23.10.0",
"packageVersion": "23.11.0",
"projectName": "aspose-barcode-cloud"
}
4 changes: 2 additions & 2 deletions codegen/config.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"artifactVersion": "23.7.0",
"npmName": "aspose-barcode-cloud-node",
"npmVersion": "23.10.0",
"npmVersion": "23.11.0",
"packageName": "Aspose.BarCode.Cloud.Sdk",
"packageVersion": "23.10.0",
"packageVersion": "23.11.0",
"supportsES6": true
}
19 changes: 19 additions & 0 deletions scripts/post-release.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash
set -euo pipefail

pushd "$( dirname "${BASH_SOURCE[0]}" )"

pushd "../submodules"
for d in */ ; do
pushd "$d"

# Update Repo
git fetch
# Rebase release-* branch on remote main
git rebase origin/main

git switch main
git merge --ff-only origin/main

popd >/dev/null
done
49 changes: 35 additions & 14 deletions spec/aspose-barcode-cloud.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@
"GS1DotCode",
"HanXin",
"GS1HanXin",
"GS1Aztec"
"GS1Aztec",
"GS1MicroPdf417"
]
},
{
Expand Down Expand Up @@ -562,7 +563,8 @@
"GS1DotCode",
"HanXin",
"GS1HanXin",
"GS1Aztec"
"GS1Aztec",
"GS1MicroPdf417"
]
},
{
Expand Down Expand Up @@ -1160,7 +1162,8 @@
"HanXin",
"GS1HanXin",
"GS1Aztec",
"GS1CompositeBar"
"GS1CompositeBar",
"GS1MicroPdf417"
]
},
{
Expand Down Expand Up @@ -1246,7 +1249,7 @@
"type": "integer",
"name": "Timeout",
"in": "query",
"description": "Timeout of recognition process in milliseconds.\nDefault value is 15_000 (15 seconds).\nMaximum value is 60_000 (1 minute).\nIn case of a timeout RequestTimeout (408) status will be returned.\nTry reducing the image size to avoid timeout.",
"description": "Timeout of recognition process in milliseconds.\nDefault value is 15_000 (15 seconds).\nMaximum value is 30_000 (1/2 minute).\nIn case of a timeout RequestTimeout (408) status will be returned.\nTry reducing the image size to avoid timeout.",
"format": "int32",
"x-nullable": true
},
Expand Down Expand Up @@ -1587,7 +1590,8 @@
"HanXin",
"GS1HanXin",
"GS1Aztec",
"GS1CompositeBar"
"GS1CompositeBar",
"GS1MicroPdf417"
]
},
{
Expand Down Expand Up @@ -1726,7 +1730,8 @@
"HanXin",
"GS1HanXin",
"GS1Aztec",
"GS1CompositeBar"
"GS1CompositeBar",
"GS1MicroPdf417"
]
},
{
Expand Down Expand Up @@ -1812,7 +1817,7 @@
"type": "integer",
"name": "Timeout",
"in": "query",
"description": "Timeout of recognition process in milliseconds.\nDefault value is 15_000 (15 seconds).\nMaximum value is 60_000 (1 minute).\nIn case of a timeout RequestTimeout (408) status will be returned.\nTry reducing the image size to avoid timeout.",
"description": "Timeout of recognition process in milliseconds.\nDefault value is 15_000 (15 seconds).\nMaximum value is 30_000 (1/2 minute).\nIn case of a timeout RequestTimeout (408) status will be returned.\nTry reducing the image size to avoid timeout.",
"format": "int32",
"x-nullable": true
},
Expand Down Expand Up @@ -2830,7 +2835,8 @@
"GS1DotCode",
"HanXin",
"GS1HanXin",
"GS1Aztec"
"GS1Aztec",
"GS1MicroPdf417"
],
"enum": [
"Codabar",
Expand Down Expand Up @@ -2903,7 +2909,8 @@
"GS1DotCode",
"HanXin",
"GS1HanXin",
"GS1Aztec"
"GS1Aztec",
"GS1MicroPdf417"
]
},
"CodeLocation": {
Expand Down Expand Up @@ -4191,12 +4198,24 @@
"$ref": "#/definitions/ECIEncodings"
},
"Code128Emulation": {
"description": "Function codeword for Code 128 emulation. Applied for MicroPDF417 only. Ignored for PDF417 and MacroPDF417 barcodes.",
"description": "DEPRECATED: This property is obsolete and will be removed in future releases. See samples of using new parameters on https://releases.aspose.com/barcode/net/release-notes/2023/aspose-barcode-for-net-23-10-release-notes/\nFunction codeword for Code 128 emulation. Applied for MicroPDF417 only. Ignored for PDF417 and MacroPDF417 barcodes.",
"$ref": "#/definitions/Code128Emulation"
},
"IsCode128Emulation": {
"type": "boolean",
"description": "Can be used only with MicroPdf417 and encodes Code 128 emulation modes.\nCan encode FNC1 in second position modes 908 and 909,\nalso can encode 910 and 911 which just indicate that recognized MicroPdf417 can be interpret as Code 128."
},
"Pdf417MacroTerminator": {
"description": "Used to tell the encoder whether to add Macro PDF417 Terminator (codeword 922) to the segment.\nApplied only for Macro PDF417.",
"$ref": "#/definitions/Pdf417MacroTerminator"
},
"IsLinked": {
"type": "boolean",
"description": "Defines linked modes with GS1MicroPdf417, MicroPdf417 and Pdf417 barcodes.\nWith GS1MicroPdf417 symbology encodes 906, 907, 912, 913, 914, 915 “Linked” UCC/EAN-128 modes.\nWith MicroPdf417 and Pdf417 symbologies encodes 918 linkage flag to associated linear component other than an EAN.UCC."
},
"MacroCharacters": {
"description": "Macro Characters 05 and 06 values are used to obtain more compact encoding in special modes.\nCan be used only with MicroPdf417 and encodes 916 and 917 MicroPdf417 modes.\nDefault value: MacroCharacters.None.",
"$ref": "#/definitions/MacroCharacter"
}
}
},
Expand Down Expand Up @@ -4244,7 +4263,7 @@
},
"Code128Emulation": {
"type": "string",
"description": "",
"description": "DEPRECATED. This enum will be removed in future releases\nFunction codewords for Code 128 emulation. Applied for MicroPDF417 only. Ignored\nfor PDF417 and MacroPDF417 barcodes.",
"x-enumNames": [
"None",
"Code903",
Expand Down Expand Up @@ -4944,7 +4963,8 @@
"HanXin",
"GS1HanXin",
"GS1Aztec",
"GS1CompositeBar"
"GS1CompositeBar",
"GS1MicroPdf417"
],
"enum": [
"all",
Expand Down Expand Up @@ -5029,7 +5049,8 @@
"HanXin",
"GS1HanXin",
"GS1Aztec",
"GS1CompositeBar"
"GS1CompositeBar",
"GS1MicroPdf417"
]
},
"ChecksumValidation": {
Expand Down Expand Up @@ -5113,7 +5134,7 @@
},
"Timeout": {
"type": "integer",
"description": "Timeout of recognition process in milliseconds.\nDefault value is 15_000 (15 seconds).\nMaximum value is 60_000 (1 minute).\nIn case of a timeout RequestTimeout (408) status will be returned.\nTry reducing the image size to avoid timeout.",
"description": "Timeout of recognition process in milliseconds.\nDefault value is 15_000 (15 seconds).\nMaximum value is 30_000 (1/2 minute).\nIn case of a timeout RequestTimeout (408) status will be returned.\nTry reducing the image size to avoid timeout.",
"format": "int32"
},
"MedianSmoothingWindowSize": {
Expand Down