diff --git a/codegen/Templates/android/apiException.mustache b/codegen/Templates/android/apiException.mustache index e4d1981..a48bae8 100644 --- a/codegen/Templates/android/apiException.mustache +++ b/codegen/Templates/android/apiException.mustache @@ -22,10 +22,10 @@ import androidx.core.content.ContextCompat import com.aspose.barcode.cloud.ApiClient import com.aspose.barcode.cloud.ApiException import com.aspose.barcode.cloud.api.BarcodeApi +import com.aspose.barcode.cloud.model.CodeLocation import com.aspose.barcode.cloud.model.EncodeBarcodeType -import com.aspose.barcode.cloud.model.PresetType import com.aspose.barcode.cloud.requests.GetBarcodeGenerateRequest -import com.aspose.barcode.cloud.requests.PostBarcodeRecognizeFromUrlOrContentRequest +import com.aspose.barcode.cloud.requests.ScanBarcodeRequest import com.google.android.material.snackbar.Snackbar import java.io.File import java.io.FileOutputStream @@ -172,8 +172,8 @@ class MainActivity : AppCompatActivity() { if (resultCode == RESULT_OK) { val bmpImage = data?.extras?.get("data") as Bitmap recognizeBarcode(bmpImage) - } } + } else -> { showErrorMessage("No file selected") @@ -195,12 +195,11 @@ class MainActivity : AppCompatActivity() { smallerBmp.compress(Bitmap.CompressFormat.PNG, 100, output) } - val recognizeRequest = PostBarcodeRecognizeFromUrlOrContentRequest() - recognizeRequest.preset = PresetType.HIGHPERFORMANCE.value - recognizeRequest.image = tmpFile + val apiRequest = ScanBarcodeRequest(tmpFile); + Thread { try { - val recognized = api.postBarcodeRecognizeFromUrlOrContent(recognizeRequest) + val recognized = api.scanBarcode(apiRequest) runOnUiThread { stopRecognizeAnimation() @@ -253,6 +252,7 @@ class MainActivity : AppCompatActivity() { barcodeRequest.imageHeight = barcodeImgView.measuredHeight.toDouble() barcodeRequest.imageWidth = barcodeImgView.measuredWidth.toDouble() barcodeRequest.format = "png" + Thread { try { val generated: File? = api.getBarcodeGenerate(barcodeRequest) @@ -293,7 +293,10 @@ class MainActivity : AppCompatActivity() { getContentIntent.type = "image/*" getContentIntent.addCategory(Intent.CATEGORY_OPENABLE) try { - startActivityForResult(Intent.createChooser(getContentIntent, "Select an Image to Recognize"), ACTION_GET_CONTENT_CALLBACK_CODE) + startActivityForResult( + Intent.createChooser(getContentIntent, "Select an Image to Recognize"), + ACTION_GET_CONTENT_CALLBACK_CODE + ) } catch (ex: java.lang.Exception) { showErrorMessage("Unable to start file selector") } diff --git a/codegen/Templates/android/build.mustache b/codegen/Templates/android/build.mustache index 97c6d70..c0300a3 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.2.0' apply false - id 'com.android.library' version '8.2.0' apply false + 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.7.21' apply false } ext.kotlin_version = '1.7.21' diff --git a/codegen/Templates/nodejs/package.mustache b/codegen/Templates/nodejs/package.mustache index 0214c1c..cb3acbf 100644 --- a/codegen/Templates/nodejs/package.mustache +++ b/codegen/Templates/nodejs/package.mustache @@ -129,14 +129,14 @@ "dist" ], "engines": { - "node": ">=12" + "node": ">=16" }, "scripts": { - "test": "tsdx test", - "cover": "tsdx test --collect-coverage", + "test": "dts test", + "cover": "dts test --coverage", "lint": "tsc --strict", - "format": "tsdx lint src test --fix", - "prepare": "tsdx build --target=node", + "format": "dts lint src test --fix", + "prepare": "dts build --target node", "check-updates": "ncu -u --enginesNode" }, "prettier": { @@ -147,13 +147,16 @@ "tabWidth": 4 }, "devDependencies": { - "@types/uuid": "^8.3.4", - "npm-check-updates": "^12.5.12", - "ts-jest": "^26.5.6", - "tsdx": "^0.14.1", - "tslib": "^2.5.0", - "typescript": "^4.9.5", - "uuid": "^8.3.2" + "@types/uuid": "^9.0.8", + "dts-cli": "^2.0.5", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-prettier": "^5.1.3", + "npm-check-updates": "^16.14.20", + "prettier": "^3.2.5", + "ts-jest": "^29.1.3", + "tslib": "^2.6.2", + "typescript": "^5.4.5", + "uuid": "^9.0.1" }, "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 4c785e3..77bdcf4 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.5+ +- Python 3.6+ 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/api_client.mustache b/codegen/Templates/python/api_client.mustache index 79a900f..463497c 100644 --- a/codegen/Templates/python/api_client.mustache +++ b/codegen/Templates/python/api_client.mustache @@ -263,7 +263,7 @@ class ApiClient(object): if data is None: return None - if type(klass) == str: + if isinstance(klass, str): if klass.startswith("list["): sub_kls = re.match(r"list\[(.*)]", klass).group(1) return [self.__deserialize(sub_data, sub_kls) diff --git a/codegen/Templates/python/setup.mustache b/codegen/Templates/python/setup.mustache index 3118c42..2027933 100644 --- a/codegen/Templates/python/setup.mustache +++ b/codegen/Templates/python/setup.mustache @@ -46,7 +46,6 @@ setup( "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", diff --git a/codegen/Templates/python/tox.mustache b/codegen/Templates/python/tox.mustache index ed63a29..afbdd7e 100644 --- a/codegen/Templates/python/tox.mustache +++ b/codegen/Templates/python/tox.mustache @@ -1,6 +1,8 @@ ; Use tox version 3.x +; Run particular env: +; python -m tox -e 3.6 [tox] -envlist = 2.7, 3.5, 3.12 +envlist = 2.7, 3.6, 3.12 [testenv] passenv = TEST_CONFIGURATION_ACCESS_TOKEN @@ -8,11 +10,11 @@ skip_install=True whitelist_externals = docker echo commands_pre= - docker run --name test-py{envname} -ti -d -v {toxinidir}:/submodules/python -e TEST_CONFIGURATION_ACCESS_TOKEN python:{envname}-buster - docker exec --workdir /submodules/python test-py{envname} python -m pip install -r requirements.txt -r lint-requirements.txt -r test-requirements.txt + docker run --name test-py{envname} -ti -d -v {toxinidir}:/src -e TEST_CONFIGURATION_ACCESS_TOKEN python:{envname} + docker exec --workdir /src test-py{envname} python -m pip install -r requirements.txt -r lint-requirements.txt -r test-requirements.txt +commands= + docker exec -t --workdir /src test-py{envname} python -m pytest --cov=aspose_barcode_cloud tests/ + docker exec -t --workdir /src test-py{envname} python -Werror example.py commands_post= docker stop test-py{envname} docker rm test-py{envname} -commands= - docker exec -t --workdir /submodules/python test-py{envname} python -Werror -m pytest --cov=aspose_barcode_cloud tests/ - docker exec -t --workdir /submodules/python test-py{envname} python -Werror example.py diff --git a/codegen/config-android.json b/codegen/config-android.json index 6a2c4f7..903504f 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.4.0", + "artifactVersion": "24.5.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 bca0966..046085d 100644 --- a/codegen/config-dart.json +++ b/codegen/config-dart.json @@ -1,8 +1,8 @@ { + "allowUnicodeIdentifiers": true, "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.4", - "useEnumExtension": true, - "allowUnicodeIdentifiers": true -} + "pubVersion": "1.24.5", + "useEnumExtension": true +} \ No newline at end of file diff --git a/codegen/config-go.json b/codegen/config-go.json index cf73d25..753c8a3 100644 --- a/codegen/config-go.json +++ b/codegen/config-go.json @@ -1,4 +1,4 @@ { "packageName": "barcode", - "packageVersion": "1.2404.0" + "packageVersion": "1.2405.0" } \ No newline at end of file diff --git a/codegen/config-java.json b/codegen/config-java.json index 63a69cb..2852e08 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.4.0", + "artifactVersion": "24.5.0", "developerEmail": "denis.averin@aspose.com", "developerName": "Denis Averin", "developerOrganization": "Aspose", diff --git a/codegen/config-php.json b/codegen/config-php.json index 43155b2..e12f7a2 100644 --- a/codegen/config-php.json +++ b/codegen/config-php.json @@ -1,4 +1,4 @@ { - "artifactVersion": "24.4.0", + "artifactVersion": "24.5.0", "invokerPackage": "Aspose\\BarCode" } \ No newline at end of file diff --git a/codegen/config-python.json b/codegen/config-python.json index 505f3b9..8444e35 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.4.0", + "packageVersion": "24.5.0", "projectName": "aspose-barcode-cloud" } \ No newline at end of file diff --git a/codegen/config.json b/codegen/config.json index a0c03a2..06d20f9 100644 --- a/codegen/config.json +++ b/codegen/config.json @@ -1,8 +1,8 @@ { "artifactVersion": "23.7.0", "npmName": "aspose-barcode-cloud-node", - "npmVersion": "24.4.0", + "npmVersion": "24.5.0", "packageName": "Aspose.BarCode.Cloud.Sdk", - "packageVersion": "24.4.0", + "packageVersion": "24.5.0", "supportsES6": true } \ No newline at end of file diff --git a/submodules/android b/submodules/android index f391c49..e3e5b2a 160000 --- a/submodules/android +++ b/submodules/android @@ -1 +1 @@ -Subproject commit f391c49cf4b727d7940ce9c0bdd1df715cb1ecec +Subproject commit e3e5b2aae1e1f35bf68f0396e381193255c3ecdc diff --git a/submodules/dart b/submodules/dart index 3c1ebce..e44f7f8 160000 --- a/submodules/dart +++ b/submodules/dart @@ -1 +1 @@ -Subproject commit 3c1ebceb24518763134b78fc092abe4b4e035765 +Subproject commit e44f7f8cba9f1ca76ce203cb3ebb44f69453133f diff --git a/submodules/dotnet b/submodules/dotnet index a3c3ee5..b991d3f 160000 --- a/submodules/dotnet +++ b/submodules/dotnet @@ -1 +1 @@ -Subproject commit a3c3ee586baf8a3e22e4fd2969ceb4b1f647f14a +Subproject commit b991d3f6717fbe498c5eda2f8f532b054aedaa09 diff --git a/submodules/go b/submodules/go index 640d344..bb7a23f 160000 --- a/submodules/go +++ b/submodules/go @@ -1 +1 @@ -Subproject commit 640d344567438783beaba350eb49cba42c46a3ae +Subproject commit bb7a23f8064e787b20d11b0188615c19406ed3ab diff --git a/submodules/java b/submodules/java index 94419f2..7209232 160000 --- a/submodules/java +++ b/submodules/java @@ -1 +1 @@ -Subproject commit 94419f254fcf060bb73c0c80251688a691537280 +Subproject commit 7209232620ae2e99bc6826b2cd4237daf94b05ee diff --git a/submodules/node b/submodules/node index cfa9289..b11f6b3 160000 --- a/submodules/node +++ b/submodules/node @@ -1 +1 @@ -Subproject commit cfa92896a99a82b2d6f20f98d7ec8e56f7fdc764 +Subproject commit b11f6b3c4d8bfcb09f815bfe088e7bdc467ffd9c diff --git a/submodules/php b/submodules/php index 5d8665e..cedb44b 160000 --- a/submodules/php +++ b/submodules/php @@ -1 +1 @@ -Subproject commit 5d8665e69a725326c6efec7b43db1f4c8c9a3d3c +Subproject commit cedb44b2b1b8650ea72fc17c632b81fbc0d480ca diff --git a/submodules/python b/submodules/python index 1540b5a..d3b94fd 160000 --- a/submodules/python +++ b/submodules/python @@ -1 +1 @@ -Subproject commit 1540b5a2c2e31ddcabce4688272343e0cb0f7ab9 +Subproject commit d3b94fd2daf69e1907035c5f17ce49df34ed9adc