bump model version

greaka · Mar 18, 2024 · 49740f5 · 49740f5
1 parent 4658cfe
commit 49740f5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
@@ -2,7 +2,7 @@ name: integration_test
 
 on:
   push:
-  pull_request:
+  pull_request_target:
   schedule:
     - cron: '30 5 * * *'
   workflow_dispatch:

diff --git a/http/tests/pets.rs b/http/tests/pets.rs
@@ -1,8 +1,8 @@
 #![cfg(feature = "blocking")]
 
 use gw2lib::{
-	model::game_mechanics::pets::{Pet, PetId},
-	Requester
+    model::game_mechanics::pets::{Pet, PetId},
+    Requester,
 };
 
 pub mod setup;

diff --git a/model/Cargo.toml b/model/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gw2lib-model"
-version = "2.1.4"
+version = "2.1.5"
 authors = ["Greaka <[email protected]>"]
 edition = "2021"
 workspace = "../"

diff --git a/model/src/authenticated/characters.rs b/model/src/authenticated/characters.rs
@@ -2,8 +2,10 @@ use std::collections::HashMap;
 
 use serde::{Deserialize, Serialize};
 
+// todo: remove this pub use on next breaking version
+pub use crate::game_mechanics::pets::PetId;
 use crate::{
-    game_mechanics::{skills::SkillId, specializations::SpecializationId, traits::TraitId, pets::PetId},
+    game_mechanics::{skills::SkillId, specializations::SpecializationId, traits::TraitId},
     items::{itemstats::StatsId, recipes::RecipeId, skins::SkinId, AttributeType, ItemId},
     misc::{colors::ColorId, titles::TitleId},
     pvp::amulets::AmuletId,

diff --git a/model/src/game_mechanics.rs b/model/src/game_mechanics.rs
@@ -1,4 +1,4 @@
+pub mod pets;
 pub mod skills;
 pub mod specializations;
 pub mod traits;
-pub mod pets;
diff --git a/model/src/game_mechanics/pets.rs b/model/src/game_mechanics/pets.rs
@@ -1,24 +1,24 @@
 use serde::{Deserialize, Serialize};
 
-use crate::*;
 pub use crate::game_mechanics::skills::SkillId;
+use crate::*;
 
 pub type PetId = u16;
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[cfg_attr(test, serde(deny_unknown_fields))]
 pub struct PetSkill {
-	pub id: SkillId,
+    pub id: SkillId,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[cfg_attr(test, serde(deny_unknown_fields))]
 pub struct Pet {
-	pub id: PetId,
-	pub name: String,
-	pub description: String,
-	pub icon: Option<String>,
-	pub skills: Vec<PetSkill>,
+    pub id: PetId,
+    pub name: String,
+    pub description: String,
+    pub icon: Option<String>,
+    pub skills: Vec<PetSkill>,
 }
 
 impl Endpoint for Pet {
@@ -29,7 +29,7 @@ impl Endpoint for Pet {
 }
 
 impl EndpointWithId for Pet {
-	type IdType = PetId;
+    type IdType = PetId;
 }
 
 impl BulkEndpoint for Pet {