Skip to content

Commit

Permalink
Merge branch 'master' into guillaume/feat/add-events-groups-concept
Browse files Browse the repository at this point in the history
  • Loading branch information
GuillaumeDecMeetsMore committed Dec 5, 2024
2 parents a2c5078 + 5cdee2d commit 06eac41
Show file tree
Hide file tree
Showing 9 changed files with 257 additions and 284 deletions.
9 changes: 9 additions & 0 deletions alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ FROM messense/rust-musl-cross:${ARCH}-musl AS builder

ARG ARCH=x86_64
ARG APP_NAME=nittei
ARG RUST_VERSION=1.83.0
# Install and set the specific Rust version
RUN rustup install ${RUST_VERSION} && rustup default ${RUST_VERSION}

# Install the musl target for the correct architecture
RUN rustup target add ${ARCH}-unknown-linux-musl

# Verify the Rust and target setup
RUN rustc --version && rustup show

# Copy source code from previous stage
COPY . .
Expand Down
12 changes: 6 additions & 6 deletions clients/javascript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@
"dayjs": "1.11.13"
},
"devDependencies": {
"@biomejs/biome": "1.9.3",
"@types/jest": "^29.5.13",
"@biomejs/biome": "1.9.4",
"@types/jest": "^29.5.14",
"@types/jsonwebtoken": "9.0.7",
"@types/node": "20.14.10",
"@types/node": "22.10.1",
"@types/uuid": "10.0.0",
"jest": "29.7.0",
"jsonwebtoken": "9.0.2",
"ts-jest": "29.2.5",
"ts-node": "10.9.2",
"tsup": "8.3.0",
"typescript": "5.6.3",
"uuid": "10.0.0"
"tsup": "8.3.5",
"typescript": "5.7.2",
"uuid": "11.0.3"
}
}
2 changes: 1 addition & 1 deletion crates/api/src/event/sync_event_reminders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ async fn create_event_reminders(
}

#[async_trait::async_trait(?Send)]
impl<'a> UseCase for SyncEventRemindersUseCase<'a> {
impl UseCase for SyncEventRemindersUseCase<'_> {
type Response = ();

type Error = UseCaseError;
Expand Down
2 changes: 1 addition & 1 deletion crates/api_structs/src/helpers/deserialize_uuids_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ where
{
struct StringVecVisitor;

impl<'de> de::Visitor<'de> for StringVecVisitor {
impl de::Visitor<'_> for StringVecVisitor {
type Value = Option<Vec<ID>>;

fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
Expand Down
2 changes: 1 addition & 1 deletion crates/domain/src/shared/entity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ impl<'de> Deserialize<'de> for ID {
{
struct IDVisitor;

impl<'de> Visitor<'de> for IDVisitor {
impl Visitor<'_> for IDVisitor {
type Value = ID;

fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
Expand Down
2 changes: 1 addition & 1 deletion crates/domain/src/shared/recurrence.rs
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ impl<'de> Deserialize<'de> for WeekDayRecurrence {
{
struct WeekDayVisitor;

impl<'de> Visitor<'de> for WeekDayVisitor {
impl Visitor<'_> for WeekDayVisitor {
type Value = WeekDayRecurrence;

fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
Expand Down
2 changes: 1 addition & 1 deletion debian.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUST_VERSION=1.80.1
ARG RUST_VERSION=1.83.0
ARG APP_NAME=nittei

FROM rust:${RUST_VERSION}-slim AS builder
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"author": "",
"license": "MIT",
"devDependencies": {
"@biomejs/biome": "1.9.3"
"@biomejs/biome": "1.9.4"
}
}
Loading

0 comments on commit 06eac41

Please sign in to comment.