Merge pull request #2069 from andy840119/update-package-to-the-latest

Update package to the latest.
karaoke-dev · Jul 16, 2023 · fed09e8 · fed09e8
2 parents 7f7ed72 + 2c01628
commit fed09e8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Stores/BaseGlyphStoreTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Stores/BaseGlyphStoreTest.cs
@@ -75,8 +75,8 @@ public void CompareGetBaseHeightWithOrigin()
     [TestCase('#')]
     public void CompareGetCharacterGlyphWithOrigin(char c)
     {
-        var expected = GlyphStore.Get(c);
-        var actual = CustomizeGlyphStore.Get(c);
+        var expected = GlyphStore.Get(c)!;
+        var actual = CustomizeGlyphStore.Get(c)!;
 
         // because get character glyph should make sure that this glyph store contains char, so will not be null.
         Assert.IsNotNull(expected);

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Overlays/TestSceneOverlayColourProvider.cs b/osu.Game.Rulesets.Karaoke.Tests/Overlays/TestSceneOverlayColourProvider.cs
@@ -78,7 +78,7 @@ public TitleTableColumn(string title)
     private partial class PreviewColourDrawable : CompositeDrawable
     {
         [Resolved]
-        private GameHost host { get; set; } = null!;
+        private Clipboard clipboard { get; set; } = null!;
 
         private readonly Color4 color;
 
@@ -105,7 +105,7 @@ public PreviewColourDrawable(Color4 color)
 
         protected override bool OnClick(ClickEvent e)
         {
-            host.GetClipboard()?.SetText(color.ToHex());
+            clipboard.SetText(color.ToHex());
             return base.OnClick(e);
         }
     }

diff --git a/...araoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestSceneLyricEditorColourProvider.cs b/...araoke.Tests/Screens/Edit/Beatmap/Lyrics/Components/TestSceneLyricEditorColourProvider.cs
@@ -108,7 +108,7 @@ public TitleTableColumn(string title)
     private partial class PreviewColourDrawable : CompositeDrawable
     {
         [Resolved]
-        private GameHost host { get; set; } = null!;
+        private Clipboard clipboard { get; set; } = null!;
 
         private readonly Color4 color;
 
@@ -135,7 +135,7 @@ public PreviewColourDrawable(Color4 color)
 
         protected override bool OnClick(ClickEvent e)
         {
-            host.GetClipboard()?.SetText(color.ToHex());
+            clipboard.SetText(color.ToHex());
             return base.OnClick(e);
         }
     }

diff --git a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSidebar.cs b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSidebar.cs
@@ -39,7 +39,7 @@ private void load(OverlayColourProvider colourProvider, Bindable<APIChangelogBui
             new Box
             {
                 RelativeSizeAxes = Axes.Y,
-                Width = OsuScrollContainer.SCROLL_BAR_HEIGHT,
+                Width = OsuScrollContainer.SCROLL_BAR_WIDTH,
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
                 Colour = colourProvider.Background3,

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics;
 public partial class LyricEditorClipboard : Component, ILyricEditorClipboard
 {
     [Resolved]
-    private GameHost host { get; set; } = null!;
+    private Clipboard clipboard { get; set; } = null!;
 
     [Resolved]
     private OnScreenDisplay? onScreenDisplay { get; set; }
@@ -412,7 +412,7 @@ private void copyObjectToClipboard<T>(T obj)
         var settings = KaraokeJsonSerializableExtensions.CreateGlobalSettings();
         string text = JsonConvert.SerializeObject(obj, settings);
 
-        host.GetClipboard()?.SetText(text);
+        clipboard.SetText(text);
     }
 
     private void saveObjectToTheClipboardContent<T>(T obj)

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -11,14 +11,14 @@
     <PackageReference Include="osu.Game.Rulesets.Karaoke.Resources" Version="2022.611.0" />
     <PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
     <PackageReference Include="LrcParser" Version="2023.524.0" />
-    <PackageReference Include="Octokit" Version="6.0.0" />
-    <PackageReference Include="osu.Framework.KaraokeFont" Version="2023.526.0" />
-    <PackageReference Include="osu.Framework.Microphone" Version="2023.502.0" />
-    <PackageReference Include="ppy.LocalisationAnalyser" Version="2023.615.0">
+    <PackageReference Include="Octokit" Version="7.0.1" />
+    <PackageReference Include="osu.Framework.KaraokeFont" Version="2023.627.1" />
+    <PackageReference Include="osu.Framework.Microphone" Version="2023.627.0" />
+    <PackageReference Include="ppy.LocalisationAnalyser" Version="2023.712.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ppy.osu.Game" Version="2023.621.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2023.716.0" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Kuromoji" Version="4.8.0-beta00016" />
     <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta18" />