Merge branch 'main' into tox

canonical · Jan 13, 2023 · 4526909 · 4526909
2 parents ebce80c + c1e240c
commit 4526909
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/snapcraft_legacy/internal/project_loader/_extensions/kde_neon.py b/snapcraft_legacy/internal/project_loader/_extensions/kde_neon.py
@@ -31,10 +31,10 @@
         build_snaps=["kde-frameworks-5-core18-sdk/latest/stable"],
     ),
     core20=_ExtensionInfo(
-        cmake_args="-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-98-qt-5-15-6-core20-sdk/current",
-        content="kde-frameworks-5-98-qt-5-15-6-core20-all",
-        provider="kde-frameworks-5-98-qt-5-15-6-core20",
-        build_snaps=["kde-frameworks-5-98-qt-5-15-6-core20-sdk/latest/stable"],
+        cmake_args="-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-99-qt-5-15-7-core20-sdk/current",
+        content="kde-frameworks-5-99-qt-5-15-7-core20-all",
+        provider="kde-frameworks-5-99-qt-5-15-7-core20",
+        build_snaps=["kde-frameworks-5-99-qt-5-15-7-core20-sdk/latest/stable"],
     ),
 )
 

diff --git a/tests/legacy/unit/project_loader/extensions/test_kde_neon.py b/tests/legacy/unit/project_loader/extensions/test_kde_neon.py
@@ -93,9 +93,9 @@ def test_extension_core20():
                 "interface": "content",
                 "target": "$SNAP/data-dir/icons",
             },
-            "kde-frameworks-5-98-qt-5-15-6-core20": {
-                "content": "kde-frameworks-5-98-qt-5-15-6-core20-all",
-                "default-provider": "kde-frameworks-5-98-qt-5-15-6-core20",
+            "kde-frameworks-5-99-qt-5-15-7-core20": {
+                "content": "kde-frameworks-5-99-qt-5-15-7-core20-all",
+                "default-provider": "kde-frameworks-5-99-qt-5-15-7-core20",
                 "interface": "content",
                 "target": "$SNAP/kf5",
             },
@@ -113,15 +113,15 @@ def test_extension_core20():
     assert kde_neon_extension.part_snippet == {
         "build-environment": [
             {
-                "SNAPCRAFT_CMAKE_ARGS": "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-98-qt-5-15-6-core20-sdk/current"
+                "SNAPCRAFT_CMAKE_ARGS": "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-99-qt-5-15-7-core20-sdk/current"
             }
         ]
     }
     assert kde_neon_extension.parts == {
         "kde-neon-extension": {
             "build-packages": ["g++"],
-            "build-snaps": ["kde-frameworks-5-98-qt-5-15-6-core20-sdk/latest/stable"],
-            "make-parameters": ["PLATFORM_PLUG=kde-frameworks-5-98-qt-5-15-6-core20"],
+            "build-snaps": ["kde-frameworks-5-99-qt-5-15-7-core20-sdk/latest/stable"],
+            "make-parameters": ["PLATFORM_PLUG=kde-frameworks-5-99-qt-5-15-7-core20"],
             "plugin": "make",
             "source": "$SNAPCRAFT_EXTENSIONS_DIR/desktop",
             "source-subdir": "kde-neon",