Skip to content

Commit 6e5440d

Browse files
committed
Fix duplicate project names and Android applicationId conflicts
- Fix duplicate Android applicationId for both webview projects: - foundational: com.dynamsoft.dbrjswebview.foundational - rtu: com.dynamsoft.dbrjswebview.rtu - Fix duplicate Android rootProject names in settings.gradle - Fix duplicate package.json names: - capacitor: dbrjs-capacitor-rtu - native-ts: dbrjs-native-ts-rtu - electron foundational: dbrjs-electron-foundational - electron rtu: dbrjs-electron-rtu - svelte foundational: dbrjs-svelte-foundational - svelte rtu: dbrjs-svelte-rtu Resolves IDE/Gradle workspace conflicts and console errors
1 parent a317e6f commit 6e5440d

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

frameworks/capacitor/scan-using-rtu-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "dbrjs-capacitor",
2+
"name": "dbrjs-capacitor-rtu",
33
"version": "1.0.0",
44
"description": "",
55
"main": "index.js",

frameworks/electron/scan-using-foundational-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "dbrjs-electron-sample",
2+
"name": "dbrjs-electron-foundational",
33
"version": "1.2.0",
44
"description": "How to read barcodes from a video input in an Electron App",
55
"main": "main.js",

frameworks/electron/scan-using-rtu-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "dbrjs-electron-sample",
2+
"name": "dbrjs-electron-rtu",
33
"version": "1.2.0",
44
"description": "How to read barcodes from a video input in an Electron App",
55
"main": "main.js",

frameworks/native-ts/scan-using-rtu-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "dbrjs-capacitor",
2+
"name": "dbrjs-native-ts-rtu",
33
"version": "1.0.0",
44
"description": "",
55
"main": "index.js",

frameworks/svelte/scan-using-foundational-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "dbrjs-svelte-sample",
2+
"name": "dbrjs-svelte-foundational",
33
"private": true,
44
"version": "0.0.0",
55
"type": "module",

frameworks/svelte/scan-using-rtu-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "dbrjs-svelte-sample",
2+
"name": "dbrjs-svelte-rtu",
33
"private": true,
44
"version": "0.0.0",
55
"type": "module",

frameworks/webview/scan-using-foundational-api/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44
}
55

66
android {
7-
namespace 'com.dynamsoft.dbrjswebview'
7+
namespace 'com.dynamsoft.dbrjswebview.foundational'
88
compileSdk 33
99

1010
defaultConfig {
11-
applicationId "com.dynamsoft.dbrjswebview"
11+
applicationId "com.dynamsoft.dbrjswebview.foundational"
1212
minSdk 19
1313
targetSdk 33
1414
versionCode 1

frameworks/webview/scan-using-foundational-api/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ dependencyResolutionManagement {
1212
mavenCentral()
1313
}
1414
}
15-
rootProject.name = "Dynamsoft Barcode"
15+
rootProject.name = "Dynamsoft Barcode - Foundational API"
1616
include ':app'

frameworks/webview/scan-using-rtu-api/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44
}
55

66
android {
7-
namespace 'com.dynamsoft.dbrjswebview'
7+
namespace 'com.dynamsoft.dbrjswebview.rtu'
88
compileSdk 33
99

1010
defaultConfig {
11-
applicationId "com.dynamsoft.dbrjswebview"
11+
applicationId "com.dynamsoft.dbrjswebview.rtu"
1212
minSdk 19
1313
targetSdk 33
1414
versionCode 1

frameworks/webview/scan-using-rtu-api/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ dependencyResolutionManagement {
1212
mavenCentral()
1313
}
1414
}
15-
rootProject.name = "Dynamsoft Barcode"
15+
rootProject.name = "Dynamsoft Barcode - RTU API"
1616
include ':app'

0 commit comments

Comments
 (0)