Skip to content

Commit

Permalink
whattheduck: Fix clash between 2 functions with the same name, fix Se…
Browse files Browse the repository at this point in the history
…ntry DSN, add logging, bump dependencies, bump version
  • Loading branch information
bperel committed Nov 22, 2024
1 parent de3dec4 commit fe8058b
Show file tree
Hide file tree
Showing 26 changed files with 1,179 additions and 420 deletions.
4 changes: 2 additions & 2 deletions apps/coa-updater/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"author": "",
"license": "ISC",
"dependencies": {
"csv-generate": "^4.4.1",
"csv-parse": "^5.5.6",
"csv-generate": "^4.4.2",
"csv-parse": "^5.6.0",
"mariadb": "^3.4.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion apps/duck-estimator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"dependencies": {
"bedetheque-scraper": "^3.2.0",
"csv-parse": "^5.5.6",
"csv-parse": "^5.6.0",
"csv-writer": "^1.6.0",
"dotenv": "^16.4.5",
"electron": "^32.2.5",
Expand Down
2 changes: 1 addition & 1 deletion apps/dumili/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"@prisma/client": "^5.22.0",
"@sentry/node": "^8.39.0",
"@sentry/node": "^8.40.0",
"axios": "^1.7.7",
"busboy": "^1.6.0",
"cloudinary": "^1.41.3",
Expand Down
8 changes: 4 additions & 4 deletions apps/dumili/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
},
"dependencies": {
"@iconify-json/bi": "^1.2.1",
"@sentry/browser": "^8.39.0",
"@sentry/vue": "^8.39.0",
"@sentry/browser": "^8.40.0",
"@sentry/vue": "^8.40.0",
"@unhead/vue": "^1.11.11",
"@vueuse/core": "^11.2.0",
"@vueuse/integrations": "^11.2.0",
"@vueuse/core": "^11.3.0",
"@vueuse/integrations": "^11.3.0",
"bootstrap": "^5.3.3",
"bootstrap-vue-next": "^0.25.15",
"js-cookie": "^3.0.5",
Expand Down
4 changes: 2 additions & 2 deletions apps/edgecreator/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"prod:transfer-files-post": "pnpm -F '~ci' prod:transfer-files apps/edgecreator/api/docker-compose.yml:@apps/edgecreator/api/docker-compose.yml"
},
"dependencies": {
"@sentry/node": "^8.39.0",
"@sentry/node": "^8.40.0",
"@socket.io/admin-ui": "^0.5.1",
"@vueuse/integrations": "^11.2.0",
"@vueuse/integrations": "^11.3.0",
"axios": "^1.7.7",
"cloudinary": "^1.41.3",
"dotenv": "^16.4.5",
Expand Down
4 changes: 2 additions & 2 deletions apps/edgecreator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"@uppy/url": "^1.5.23",
"@uppy/webcam": "^1.8.13",
"@uppy/xhr-upload": "^1.7.5",
"@vueuse/core": "^11.2.0",
"@vueuse/integrations": "^11.2.0",
"@vueuse/core": "^11.3.0",
"@vueuse/integrations": "^11.3.0",
"axios": "^1.7.7",
"axios-cache-interceptor": "^1.6.2",
"bootstrap": "^5.3.3",
Expand Down
4 changes: 2 additions & 2 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"@mapbox/mapbox-gl-geocoder": "^5.0.3",
"@popperjs/core": "^2.11.8",
"@sentry/tracing": "^7.114.0",
"@sentry/vue": "^8.39.0",
"@sentry/vue": "^8.40.0",
"@unhead/vue": "^1.11.11",
"@vueuse/core": "^11.2.0",
"@vueuse/core": "^11.3.0",
"bootstrap": "^5.3.3",
"bootstrap-vue-next": "^0.24.23",
"chart.js": "^4.4.6",
Expand Down
2 changes: 1 addition & 1 deletion apps/whattheduck/.env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BASE_URL=http://localhost:8003

SENTRY_DSN=https://[email protected]/5658663
VITE_SENTRY_DSN=https://[email protected]/5658663

VITE_DM_SOCKET_URL=https://api-websocket.ducksmanager.net

Expand Down
2 changes: 2 additions & 0 deletions apps/whattheduck/android/.idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apps/whattheduck/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "net.ducksmanager.whattheduck"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 138
versionName "3.0.27"
versionCode 140
versionName "3.0.29"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
28 changes: 14 additions & 14 deletions apps/whattheduck/android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/android/capacitor')
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@6.2.0_@capacitor+core@6.2.0/node_modules/@capacitor/android/capacitor')

include ':capacitor-community-camera-preview'
project(':capacitor-community-camera-preview').projectDir = new File('../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.1.2/node_modules/@capacitor-community/camera-preview/android')
project(':capacitor-community-camera-preview').projectDir = new File('../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.2.0/node_modules/@capacitor-community/camera-preview/android')

include ':capacitor-app'
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2/node_modules/@capacitor/app/android')
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0/node_modules/@capacitor/app/android')

include ':capacitor-camera'
project(':capacitor-camera').projectDir = new File('../../../node_modules/.pnpm/@[email protected].0_@capacitor+core@6.1.2/node_modules/@capacitor/camera/android')
project(':capacitor-camera').projectDir = new File('../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.2.0/node_modules/@capacitor/camera/android')

include ':capacitor-clipboard'
project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2/node_modules/@capacitor/clipboard/android')
project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0/node_modules/@capacitor/clipboard/android')

include ':capacitor-device'
project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2/node_modules/@capacitor/device/android')
project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0/node_modules/@capacitor/device/android')

include ':capacitor-haptics'
project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2/node_modules/@capacitor/haptics/android')
project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0/node_modules/@capacitor/haptics/android')

include ':capacitor-keyboard'
project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.1.2/node_modules/@capacitor/keyboard/android')
project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@[email protected].3_@capacitor+core@6.2.0/node_modules/@capacitor/keyboard/android')

include ':capacitor-preferences'
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences/android')
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@[email protected].3_@capacitor+core@6.2.0/node_modules/@capacitor/preferences/android')

include ':capacitor-status-bar'
project(':capacitor-status-bar').projectDir = new File('../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2/node_modules/@capacitor/status-bar/android')
project(':capacitor-status-bar').projectDir = new File('../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0/node_modules/@capacitor/status-bar/android')

include ':capawesome-capacitor-app-update'
project(':capawesome-capacitor-app-update').projectDir = new File('../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.1.2/node_modules/@capawesome/capacitor-app-update/android')
project(':capawesome-capacitor-app-update').projectDir = new File('../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.2.0/node_modules/@capawesome/capacitor-app-update/android')

include ':capawesome-capacitor-file-picker'
project(':capawesome-capacitor-file-picker').projectDir = new File('../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.1.2/node_modules/@capawesome/capacitor-file-picker/android')
project(':capawesome-capacitor-file-picker').projectDir = new File('../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.2.0/node_modules/@capawesome/capacitor-file-picker/android')

include ':capgo-capacitor-updater'
project(':capgo-capacitor-updater').projectDir = new File('../../../node_modules/.pnpm/@[email protected].17_@capacitor+core@6.1.2/node_modules/@capgo/capacitor-updater/android')
project(':capgo-capacitor-updater').projectDir = new File('../../../node_modules/.pnpm/@[email protected].18_@capacitor+core@6.2.0/node_modules/@capgo/capacitor-updater/android')

include ':sentry-capacitor'
project(':sentry-capacitor').projectDir = new File('../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2_@sentry+vue@8.38[email protected][email protected].3_yryilpzyyeyclbupki7y7c7qwy/node_modules/@sentry/capacitor/android')
project(':sentry-capacitor').projectDir = new File('../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0_@sentry+vue@8.39[email protected][email protected].3_bb4wpcpoirp2yifi5phbut5gr4/node_modules/@sentry/capacitor/android')
8 changes: 4 additions & 4 deletions apps/whattheduck/ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -366,15 +366,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 138;
CURRENT_PROJECT_VERSION = 140;
DEVELOPMENT_TEAM = ZHTS8HRVD7;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.0.27;
MARKETING_VERSION = 3.0.29;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = net.ducksmanager.whattheduck;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -390,15 +390,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 138;
CURRENT_PROJECT_VERSION = 140;
DEVELOPMENT_TEAM = ZHTS8HRVD7;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.0.27;
MARKETING_VERSION = 3.0.29;
PRODUCT_BUNDLE_IDENTIFIER = net.ducksmanager.whattheduck;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
Expand Down
32 changes: 16 additions & 16 deletions apps/whattheduck/ios/App/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative '../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios/scripts/pods_helpers'
require_relative '../../../../node_modules/.pnpm/@capacitor+ios@6.2.0_@capacitor+core@6.2.0/node_modules/@capacitor/ios/scripts/pods_helpers'

platform :ios, '13.0'
use_frameworks!
Expand All @@ -9,21 +9,21 @@ use_frameworks!
install! 'cocoapods', :disable_input_output_paths => true

def capacitor_pods
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios'
pod 'CapacitorCommunityCameraPreview', :path => '../../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.1.2/node_modules/@capacitor-community/camera-preview'
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2/node_modules/@capacitor/app'
pod 'CapacitorCamera', :path => '../../../../node_modules/.pnpm/@[email protected].0_@capacitor+core@6.1.2/node_modules/@capacitor/camera'
pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2/node_modules/@capacitor/clipboard'
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2/node_modules/@capacitor/device'
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2/node_modules/@capacitor/haptics'
pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.1.2/node_modules/@capacitor/keyboard'
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences'
pod 'CapacitorStatusBar', :path => '../../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2/node_modules/@capacitor/status-bar'
pod 'CapawesomeCapacitorAppUpdate', :path => '../../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.1.2/node_modules/@capawesome/capacitor-app-update'
pod 'CapawesomeCapacitorFilePicker', :path => '../../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.1.2/node_modules/@capawesome/capacitor-file-picker'
pod 'CapgoCapacitorUpdater', :path => '../../../../node_modules/.pnpm/@[email protected].17_@capacitor+core@6.1.2/node_modules/@capgo/capacitor-updater'
pod 'SentryCapacitor', :path => '../../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.1.2_@sentry+vue@8.38[email protected][email protected].3_yryilpzyyeyclbupki7y7c7qwy/node_modules/@sentry/capacitor'
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.2.0_@capacitor+core@6.2.0/node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.2.0_@capacitor+core@6.2.0/node_modules/@capacitor/ios'
pod 'CapacitorCommunityCameraPreview', :path => '../../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.2.0/node_modules/@capacitor-community/camera-preview'
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0/node_modules/@capacitor/app'
pod 'CapacitorCamera', :path => '../../../../node_modules/.pnpm/@[email protected].1_@capacitor+core@6.2.0/node_modules/@capacitor/camera'
pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0/node_modules/@capacitor/clipboard'
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0/node_modules/@capacitor/device'
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0/node_modules/@capacitor/haptics'
pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@[email protected].3_@capacitor+core@6.2.0/node_modules/@capacitor/keyboard'
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@[email protected].3_@capacitor+core@6.2.0/node_modules/@capacitor/preferences'
pod 'CapacitorStatusBar', :path => '../../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0/node_modules/@capacitor/status-bar'
pod 'CapawesomeCapacitorAppUpdate', :path => '../../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.2.0/node_modules/@capawesome/capacitor-app-update'
pod 'CapawesomeCapacitorFilePicker', :path => '../../../../node_modules/.pnpm/@[email protected]_@capacitor+core@6.2.0/node_modules/@capawesome/capacitor-file-picker'
pod 'CapgoCapacitorUpdater', :path => '../../../../node_modules/.pnpm/@[email protected].18_@capacitor+core@6.2.0/node_modules/@capgo/capacitor-updater'
pod 'SentryCapacitor', :path => '../../../../node_modules/.pnpm/@[email protected].2_@capacitor+core@6.2.0_@sentry+vue@8.39[email protected][email protected].3_bb4wpcpoirp2yifi5phbut5gr4/node_modules/@sentry/capacitor'
end

target 'What The Duck' do
Expand Down
Loading

0 comments on commit fe8058b

Please sign in to comment.