Skip to content

Commit

Permalink
Merge branch 'feat/support-for-multiple-versions' of https://github.c…
Browse files Browse the repository at this point in the history
…om/walt-id/waltid-identity into feat/support-for-multiple-versions
  • Loading branch information
chsavvaidis committed Dec 19, 2024
2 parents 6f270e7 + 868f184 commit 15fbdbe
Show file tree
Hide file tree
Showing 34 changed files with 6,620 additions and 4,654 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ plugins {

kotlin("plugin.serialization") version kotlinVersion apply false

id("com.android.library") version "8.7.2" apply false
id("com.android.application") version "8.7.2" apply false
id("com.android.library") version "8.7.3" apply false
id("com.android.application") version "8.7.3" apply false

id("com.github.ben-manes.versions") version "0.51.0" apply false
}
Expand Down
3 changes: 2 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ val modules = listOf(
* "$libraries:crypto".group(
"waltid-crypto",
"waltid-crypto-oci",
"waltid-crypto-aws",
"waltid-crypto-android" whenEnabled enableAndroidBuild,
"waltid-crypto-ios" whenEnabled enableIosBuild,
"waltid-target-ios" whenEnabled enableIosBuild,
Expand Down Expand Up @@ -90,7 +91,7 @@ pluginManagement {
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
}

rootProject.name = "waltid-identity"
2 changes: 1 addition & 1 deletion waltid-applications/waltid-web-portal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"axios": "^1.7.2",
"eslint": "9.5.0",
"eslint-config-next": "14.2.4",
"next": "14.2.10",
"next": "14.2.15",
"postcss": "8.4.38",
"react": "18.3.1",
"react-dom": "18.3.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@heroicons/vue": "^2.1.5",
"@julr/unocss-preset-forms": "^0.1.0",
"@pinia/nuxt": "^0.5.4",
"jsonpath-plus": "^10.0.0",
"jsonpath-plus": "^10.0.7",
"pinia": "^2.2.2",
"qr-scanner": "^1.4.2",
"qrcode.vue": "^3.4.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@heroicons/vue": "^2.1.5",
"@julr/unocss-preset-forms": "^0.1.0",
"@pinia/nuxt": "^0.5.5",
"jsonpath-plus": "^10.0.0",
"jsonpath-plus": "^10.0.7",
"pinia": "^2.2.4",
"qr-scanner": "^1.4.2",
"qrcode.vue": "^3.5.0",
Expand Down
Loading

0 comments on commit 15fbdbe

Please sign in to comment.