1
0
Fork 0
mirror of https://github.com/Findus23/kurzparkzonen-wien.git synced 2024-09-18 14:53:48 +02:00

update dependencies

This commit is contained in:
Lukas Winkler 2023-08-14 22:54:07 +02:00
parent 47183294ab
commit bf57f08dc3
Signed by: lukas
GPG key ID: 54DE4D798D244853
13 changed files with 2326 additions and 766 deletions

30
Jenkinsfile vendored
View file

@ -1,30 +0,0 @@
pipeline {
agent {
docker {
image 'node'
}
}
stages {
stage('fetch geojson') {
steps {
sh './fetch.sh'
}
}
stage('yarn install') {
steps {
sh 'yarn install --pure-lockfile --ignore-engines'
}
}
stage('convert geojson') {
steps {
sh 'node convert.js'
}
}
stage('yarn build') {
steps {
sh 'yarn run build'
}
}
}
}

View file

@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
android {
compileSdkVersion 33
buildToolsVersion "33.0.1"
compileSdk 34
buildToolsVersion = "34.0.0"
defaultConfig {
applicationId "at.lw1.kurzparkzonen.wien"
minSdkVersion 23
targetSdkVersion 33
versionCode 42
versionName "0.9.4"
targetSdkVersion 34
versionCode 46
versionName "0.9.8"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
@ -19,8 +19,8 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
lint {
disable 'InvalidPackage'
@ -30,16 +30,16 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.webkit:webkit:1.6.0'
implementation 'androidx.webkit:webkit:1.7.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'com.google.android.material:material:1.8.0'
implementation "androidx.core:core-ktx:1.9.0"
implementation 'com.google.android.material:material:1.9.0'
implementation "androidx.core:core-ktx:1.10.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {

View file

@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="1505.8823"
android:viewportHeight="1505.8823">
<group android:translateX="240.94118"
android:translateY="240.94118">
<path
android:pathData="M511.99,154.53C300.7,154.53 129.4,314.58 129.4,512C129.4,709.42 300.7,869.47 511.99,869.47C723.3,869.47 894.6,709.42 894.6,512C894.6,314.58 723.3,154.53 511.99,154.53zM511.99,246.93C668.68,246.93 795.7,365.6 795.7,512C795.7,573.41 773.33,629.95 735.8,674.9L337.66,302.9C385.76,267.83 446.27,246.93 511.99,246.93zM288.2,349.1L686.34,721.1C638.24,756.17 577.73,777.05 511.99,777.05C355.32,777.05 228.3,658.38 228.3,512C228.3,450.57 250.67,394.04 288.2,349.1z"
android:fillColor="#000"
android:fillAlpha="1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
</group>
</vector>

View file

@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
</adaptive-icon>

View file

@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
</adaptive-icon>

View file

@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.7.21'
ext.kotlin_version = '1.8.22'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.0'
classpath 'com.android.tools.build:gradle:8.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

View file

@ -6,9 +6,12 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
org.gradle.unsafe.configuration-cache=true
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

View file

@ -1,13 +1,13 @@
367c11051d67611a51da53010e9887cfa3b61bfc034111922b1bdf64a7442392 AnrainerInnenparkplätze.json
b627cf437182c5abcbb25c1c93e713e4d3be43ef11743c52adaa038bfce36bd4 Behindertenparkplätze.json
7571cbf4c95e1fc5f7243149d1a5d38e83a465191b2661e280a812932bcda86e Berechtigungszone.json
a741ecd7fd09738402101957595c3004e014d67b27e1ddb7f3a5e083f08f4f43 Carsharing.json
69cba5c1da12744093a8c1eb44905efab90ff3f8ec1cf821b031cf3455a1064c Fußgängerzonen.json
f85f6b8e0ab59b24ee9e267d067fe066dc0ab1d67b37786aafb294bea77ca29b AnrainerInnenparkplätze.json
87201317c1848caa0d819416a21dbec6a2ac779f1c59b7a4b964095c054c018a Behindertenparkplätze.json
999c1de23df7a8ea3ae798c04d54dda1892cdf5630015395332ec8aa84f12673 Berechtigungszone.json
00164079694635fe90909083d2a8cb07752c1a9665f6e134380988b6dfe76bb9 Carsharing.json
85eda97f183803bbb8ce12d62166641aea7f852ea80c3293519f68f489f6da57 Fußgängerzonen.json
bb2f853211fd97ad1d456337ee063fd43444940b202661b1a48e500019349d96 Garagen.json
3db0468b52917afd35cafad3bc6517f218d55c948065791b44a403b916c562cb Geltungsbereiche.json
863a5980b72fc1963e581bc7c7565487348f0eada5f8539663d6ca2617118ce4 Kurzparkstreifen.json
e1e69e425eed1cb0f8fb28ad21e79ecd9f589f7170ba4a2b10ea064af9d3ce36 Kurzparkzonen.json
669bc9e798009d7cb8220f4acd1219785f0641c16fd00d4f399d4198705efb80 Geltungsbereiche.json
6850ac5acdd5e4748fe992fce158fb7e0ed88a0ecfcb4c4f1e7fb51c882144ea Kurzparkstreifen.json
f2a3d94864fd7d6b518e3974444edfdd14690bc172312fd10a3508f3aa87ba94 Kurzparkzonen.json
bb2f853211fd97ad1d456337ee063fd43444940b202661b1a48e500019349d96 pr.json
bd7e1a33a18c18dbf902a3a3d3597ee51117ce12e21c9b277366f122606fb125 Tempo30.json
bf82083b8d21eee438f4e9e5d418a6504df26da51be6a75a9ffe787423b7ff5a Verkaufsstellen.json
b2ca2704d2429c2870b079e4a0a4e523bc370ee08edef59132f8a51200e0890b Wohnstraßen.json
2d4d0edd11cfc8f0e4952ea544531f6f224e25de40659837b1e1c820e9ff26d8 Tempo30.json
20329f2b7a143520f4c85864cca4a7ec6cdceb53d10d29f39653d69c520b90d9 Verkaufsstellen.json
c11452e7eb2d28e0b75c602e22c67572b4ee7c2b9b377bef2e5e4a5172e24d93 Wohnstraßen.json

2965
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -25,14 +25,14 @@
"@types/topojson-client": "^3.0.0",
"@types/topojson-server": "^3.0.0",
"@types/topojson-simplify": "^3.0.0",
"@vitejs/plugin-legacy": "^3.0.2",
"@vitejs/plugin-legacy": "^4.0.2",
"autoprefixer": "^10.1.0",
"ejs": "^3.1.6",
"rome": "^11.0.0",
"rome": "^12.0.0",
"sass": "^1.49.9",
"ts-node": "^10.0.0",
"tsconfig-paths": "^4.1.0",
"typescript": "^4.1.3",
"typescript": "^5.0.4",
"vite": "^4.0.4",
"vite-plugin-precompiled-ejs": "^1.0.1"
},

View file

@ -65,6 +65,14 @@ const OpenRailwayMap = L.tileLayer('https://maps.lw1.at/tiles/1.0.0/openrailway/
attribution: 'Map data: &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors | Map style: &copy; <a href="https://www.OpenRailwayMap.org">OpenRailwayMap</a> (<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a>)'
});
const BasemapATorthofoto = L.tileLayer("https://maps.lw1.at/tiles/1.0.0/basemap_orthofoto/GLOBAL_MERCATOR/{z}/{x}/{y}.jpeg", {
maxZoom: 19,
attribution: 'Datenquelle: <a href="https://www.basemap.at">basemap.at</a>',
format: "jpeg",
bounds: [[46.35877, 8.782379], [49.037872, 17.189532]]
} as CustomTileLayerOptions);
export const mapLayers = {
"Leer": blankLayer,
"Basemap.at": BasemapATbasemap,
@ -74,6 +82,7 @@ export const mapLayers = {
"Öffi": ThunderforestTransport,
"Hell": Forte,
"Einfach": Piano,
"Orthofoto": BasemapATorthofoto,
// "dfdssdfsdfdsf": Piano
};

View file

@ -1,7 +0,0 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es5",
"esModuleInterop": true
}
}