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.

Sign up for GitHub

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

upgrade expo to sdk 46 #124

Merged
merged 4 commits into from
Aug 20, 2022
Merged

upgrade expo to sdk 46 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca14080
build(deps): upgrade expo to sdk 46
jankapunkt Aug 16, 2022
ca06aa4
refactor: move global app settings out of app.json to be able to use …
jankapunkt Aug 16, 2022
f3cecb5
fix(tests): get tests run after upgrade to expo sdk 46
jankapunkt Aug 16, 2022
c9994c0
fix(tests): fix remaining lint errors
jankapunkt Aug 16, 2022
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
11 changes: 0 additions & 11 deletions src/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,6 @@
},
"web": {
"favicon": "./assets/icons/favicon-192.png"
},
"extra": {
"backend": {
"url": "ws://192.168.178.74:8080/websocket",
"maxTimeout": 10000,
"interval": 250
},
"content": {
"url": "http://192.168.178.74:3030",
"replaceUrl": "https://content.lealernen.de"
}
}
}
}
12 changes: 7 additions & 5 deletions src/env/Config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import Constants from 'expo-constants'
import settings from '../settings.json'

const { backend, content } = settings
const debugLayoutBorders = false

export const Config = {}
Expand Down Expand Up @@ -27,10 +29,10 @@ Config.methods.createUser = 'users.methods.create'
Config.methods.deleteUser = 'users.methods.delete'

Config.backend = {}
Config.backend.url = Constants.manifest.extra.backend.url
Config.backend.maxTimeout = Constants.manifest.extra.backend.maxTimeout
Config.backend.interval = Constants.manifest.extra.backend.interval
Config.backend.url = backend.url
Config.backend.maxTimeout = backend.maxTimeout
Config.backend.interval = backend.interval

Config.content = {}
Config.content.url = Constants.manifest.extra.content.url
Config.content.replaceUrl = Constants.manifest.extra.content.replaceUrl
Config.content.url = content.url
Config.content.replaceUrl = content.replaceUrl
Loading