From 3146bf67ec8adcc9b0f432d7bb87fb1a995adf47 Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Sun, 21 Jun 2020 20:50:20 +0200
Subject: [PATCH] Prepare for v1.1.1 release (the sequel)

---
 .github/workflows/ci.yml      | 15 +++++++++++----
 .github/workflows/release.yml | 16 ++++++++--------
 README.md                     |  2 +-
 addon.xml                     |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 862ed65f..73b9b43c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,16 +28,22 @@ jobs:
         pip install -r requirements.txt
     - name: Run tox
       run: python -m tox -q -e flake8,py
+      if: always()
     - name: Run pylint
       run: python -m pylint resources/lib/ tests/
+      if: always()
     - name: Compare translations
       run: make check-translations
+      if: always()
     - name: Run unit tests
       run: coverage run -m unittest discover
+      if: always()
     - name: Run script entry
       run: coverage run -a resources/lib/script_entry.py
+      if: always()
     - name: Run service entry
       run: coverage run -a resources/lib/service_entry.py &
+      if: always()
     - name: Upload code coverage to CodeCov
       uses: codecov/codecov-action@v1
       continue-on-error: true
@@ -45,10 +51,11 @@ jobs:
     - name: Analyze with SonarCloud
       uses: dagwieers/sonarcloud-github-action@more-options
       with:
-        organization: add-ons
-        projectKey: add-ons_service.upnext
-        sources: resources/lib/
-        tests: tests/
+        args: >
+          -Dsonar.organization=im85288
+          -Dsonar.projectKey=im85288_service.upnext
+          -Dsonar.sources=resources/lib/
+          -Dsonar.tests=tests/
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e8fa1341..0e472c63 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,10 +14,10 @@ jobs:
         run: |
           sudo apt-get install libxml2-utils
           make multizip release=1
-      - name: Get Krypton filename
-        id: get-krypton-filename
+      - name: Get Leia filename
+        id: get-leia-filename
         run: |
-          echo ::set-output name=krypton-filename::$(cd ..;ls service.upnext*.zip | grep -v '+matrix.' | head -1)
+          echo ::set-output name=leia-filename::$(cd ..;ls service.upnext*.zip | grep -v '+matrix.' | head -1)
       - name: Get Matrix filename
         id: get-matrix-filename
         run: |
@@ -42,15 +42,15 @@ jobs:
           body: ${{ steps.get-body.outputs.body }}
           draft: false
           prerelease: false
-      - name: Upload Krypton/Leia zip
-        id: upload-krypton-zip 
+      - name: Upload Leia zip
+        id: upload-leia-zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_name: ${{ steps.get-krypton-filename.outputs.krypton-filename }}
-          asset_path: ../${{ steps.get-krypton-filename.outputs.krypton-filename }}
+          asset_name: ${{ steps.get-leia-filename.outputs.leia-filename }}
+          asset_path: ../${{ steps.get-leia-filename.outputs.leia-filename }}
           asset_content_type: application/zip
       - name: Upload Matrix zip
         id: upload-matrix-zip 
@@ -67,7 +67,7 @@ jobs:
         uses: xbmc/action-kodi-addon-submitter@v1.2
         with:
           kodi-repository: repo-plugins
-          kodi-version: krypton
+          kodi-version: leia
           addon-id: service.upnext
           kodi-matrix: true
         env:
diff --git a/README.md b/README.md
index a3d7775a..92f6c7e4 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ The add-on has various settings to fine-tune the experience, however the default
 For [Addon Integration](https://github.com/im85288/service.upnext/wiki/Addon-Integration) and [Skinners](https://github.com/im85288/service.upnext/wiki/Skinners) see the [wiki](https://github.com/im85288/service.upnext/wiki)
 
 ## Releases
-### v1.1.1 (2020-05-XX)
+### v1.1.1 (2020-06-21)
 - Avoid conflict with external players (@BrutuZ)
 - Restore "Ignore Playlist" option (@BrutuZ)
 - Fix a known Kodi bug related to displaying hours (@Maven85)
diff --git a/addon.xml b/addon.xml
index 86fb328f..f6ce8444 100644
--- a/addon.xml
+++ b/addon.xml
@@ -40,7 +40,7 @@ Många befintliga tillägg integreras redan med den här utanför lådan-tjänst
         <platform>all</platform>
         <license>GPL-2.0-only</license>
         <news>
-### v1.1.1 (2020-05-XX)
+### v1.1.1 (2020-06-21)
 - Avoid conflict with external players
 - Restore "Ignore Playlist" option
 - Fix a known Kodi bug related to displaying hours