Skip to content

Commit bdf7836

Browse files
Ivan KamkinDenis-Averin
authored andcommitted
Fixed templates
Scripts changed to diff default branches Submodules switched to default branch
1 parent 995d706 commit bdf7836

15 files changed

Lines changed: 41 additions & 35 deletions

File tree

codegen/Templates/android/apiException.mustache

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ class MainActivity : AppCompatActivity() {
8989
9090
client.readTimeout = 60_000
9191
92-
api = BarcodeApi(client)
92+
generateApi = GenerateApi(client)
93+
scanApi = ScanApi(client)
9394
9495
barcodeTypeSpinner = findViewById(R.id.typeSpinner)
9596
populateBarcodeTypesSpinner()
@@ -257,13 +258,13 @@ class MainActivity : AppCompatActivity() {
257258
type, barcodeTextEdit.text.toString());
258259
259260
genRequest.imageFormat = BarcodeImageFormat.PNG;
260-
genRequest.imageHeight = barcodeImgView.measuredHeight.toDouble()
261-
genRequest.imageWidth = barcodeImgView.measuredWidth.toDouble()
261+
genRequest.imageHeight = barcodeImgView.measuredHeight.toFloat()
262+
genRequest.imageWidth = barcodeImgView.measuredWidth.toFloat()
262263
263264
264265
Thread {
265266
try {
266-
val generated: File? = genApi.generate(genRequest);
267+
val generated: File? = generateApi.generate(genRequest);
267268
runOnUiThread {
268269
val bitmap = BitmapFactory.decodeFile(generated!!.absolutePath)
269270
barcodeImgView.setImageBitmap(bitmap)

codegen/Templates/go/README.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ To use Aspose.BarCode Cloud SDK for Go you need to register an account with [Asp
3838
1. Run `go get` command
3939

4040
```shell script
41-
go get -u github.com/aspose-barcode-cloud/aspose-barcode-cloud-go@v{{packageVersion}}
41+
go get -u github.com/aspose-barcode-cloud/aspose-barcode-cloud-go/v4@v{{packageVersion}}
4242
```
4343

4444
### Using GOPATH (for Go < 1.11 )
4545

4646
1. Run `go get` command outside module directory
4747

4848
```shell script
49-
go get -u github.com/aspose-barcode-cloud/aspose-barcode-cloud-go/barcode
49+
go get -u github.com/aspose-barcode-cloud/aspose-barcode-cloud-go/v4/barcode
5050
```
5151

5252
## Sample usage

codegen/Templates/java/ApiClient.mustache

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,14 +930,15 @@ public class ApiClient {
930930
.build();
931931
932932
Response response = httpClient.newCall(request).execute();
933+
String responseBody = response.body().string();
933934
if(response.isSuccessful()){
934935
GetAccessTokenResult result =
935-
json.deserialize(response.body().string(), GetAccessTokenResult.class);
936+
json.deserialize(responseBody, GetAccessTokenResult.class);
936937
setAccessToken(result.access_token);
937938
}
938939
else
939940
{
940-
throw new ApiException(response.body().string());
941+
throw new ApiException(responseBody);
941942
}
942943
} catch (Exception ex) {
943944
throw new ApiException(ex);

codegen/Templates/nodejs/package.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@
149149
"devDependencies": {
150150
"@types/uuid": "^10.0.0",
151151
"dts-cli": "^2.0.5",
152-
"eslint-config-prettier": "^9.1.0",
153-
"eslint-plugin-prettier": "^5.2.1",
152+
"eslint-config-prettier": "^10.0.1",
153+
"eslint-plugin-prettier": "^5.2.3",
154154
"npm-check-updates": "^16.14.20",
155155
"prettier": "^3.4.2",
156156
"ts-jest": "^29.1.3",
157157
"tslib": "^2.8.1",
158-
"uuid": "^11.0.3"
158+
"uuid": "^11.0.5"
159159
},
160160
"bugs": {
161161
"url": "https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-node/issues"

scripts/start-release.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ echo "Update Swagger specification..."
2121
./scripts/update_swagger_spec.bash
2222

2323
echo "Switch to main all submodules for start new branch in the right place..."
24-
./scripts/switch_all_submodules_to_main.bash
24+
./scripts/switch_all_submodules_to_default.bash
2525

2626
echo "Switching to ${branch_name}"
2727
git switch --create "${branch_name}" || git switch "${branch_name}"
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
pushd "$(dirname "$0")/../submodules"
6+
7+
for d in */ ; do
8+
pushd "$d"
9+
if [[ "$d" == *"go"* ]]
10+
then
11+
(git fetch --prune && git switch v4 && git pull --ff-only) || true
12+
else
13+
(git fetch --prune && git switch main && git pull --ff-only) || true
14+
fi
15+
16+
popd >/dev/null
17+
done
18+
19+
popd >/dev/null

scripts/switch_all_submodules_to_main.bash

Lines changed: 0 additions & 15 deletions
This file was deleted.

submodules/android

submodules/dart

Submodule dart updated from 60c8768 to fea2391

submodules/dotnet

0 commit comments

Comments
 (0)