Merge pull request #1065 from UweTrottmann/release-2024.5

Release 2024.5

.github/workflows/assemble-test-lint.yml

@@ -21,11 +21,11 @@ jobs:
 
     steps:
       - name: Check out
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - name: Set up JDK 17
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Set up JDK 21
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -53,11 +53,11 @@ jobs:
 
     steps:
       - name: Check out
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - name: Set up JDK 17
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Set up JDK 21
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
@@ -73,7 +73,7 @@ jobs:
         run: ./gradlew :app:lintAmazonRelease
 
       - name: Upload lint reports
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         if: ${{ always() }} # also upload of lint errors
         with:
           name: Lint reports

.gitignore

@@ -41,12 +41,16 @@ $RECYCLE.BIN/
 !.idea/codeStyleSettings.xml
 !.idea/codeStyles
 !.idea/copyright
+!.idea/inspectionProfiles
 !.idea/scopes
 
 ### Gradle
 .gradle/
 build/
 
+## Kotlin
+.kotlin/
+
 ## Proguard
 unused.txt
 

CHANGELOG.md

@@ -6,7 +6,47 @@
 📝 = Notable change.
 
 Releases marked with 🧪 (or previously with the "beta" suffix) were released on
-[the beta program](https://github.com/UweTrottmann/SeriesGuide/wiki/Beta) only.
+[the preview program](https://www.seriesgui.de/help/how-to/basics/preview) only.
+
+## Version 2024.5
+
+* 🌟 Shows: add a note to a show, synced with SeriesGuide Cloud or Trakt (VIP only).
+* 🌟 Movies: add link to all release dates.
+* 🔧 Shows: increase resolution of episode images.
+
+### 2024.5.4 - 2024-12-13
+
+* 🔨 Trakt: retry if show not yet in Trakt profile failed to upload during initial sync.
+* 📝 Latest user interface translations from Crowdin.
+
+### 2024.5.3 - 2024-12-11 🧪
+
+* 🔧 Shows: revert to search symbol for primary button on discover screen.
+* 🔧 Lists: ask for confirmation before deleting a list, actually call it delete instead of "just"
+  remove.
+* 📝 Latest user interface translations from Crowdin.
+
+### 2024.5.2 - 2024-12-04 🧪
+
+* 🔧 Shows: when viewing the stream or purchase provider filters, the reset button is shown as
+  disabled when no provider is selected. Also tabs are renamed and display icons to differentiate
+  filter from sort options.
+* 🔨 Show scrollbars for show filter and sort options.
+* 🔧 Use common "Sort by" action name.
+* 🔧 Android 15: turn predictive back animation back on after more issues are resolved.
+* 📝 Latest user interface translations from Crowdin.
+
+### 2024.5.1 - 2024-11-21 🧪
+
+* 🌟 Shows: add a note to a show, synced with SeriesGuide Cloud or Trakt (VIP only).
+* 🔧 Shows: increase resolution of episode images.
+* 🔧 Shows: also use plus symbol for button on discover screen to be consistent.
+
+### 2024.5.0 - 2024-11-06 🧪
+
+* 🌟 Movies: add link to all release dates.
+* 🔧 Overview: use local number format for absolute episode number.
+* 📝 Latest user interface translations from Crowdin.
 
 ## Version 2024.4
 

CONTRIBUTING.md

@@ -1,28 +1,32 @@
 # Contributing
 
-**Note:** This work is licensed under the [Apache License 2.0](LICENSE.txt).
-If you contribute any 
+ℹ️ This work is licensed under the [Apache License 2.0](LICENSE.txt).
+If you contribute any
 [non-trivial](http://www.gnu.org/prep/maintain/maintain.html#Legally-Significant)
 patches or translations make sure you have read it and agree with it.
 
-#### Would you like to contribute code?
+**Would you like to contribute code?**
+
+ℹ️ If you want to contribute larger changes, please talk to me first (comment on a related issue
+or create one). Otherwise, it is likely I won't accept your merge request.
 
 1. [Fork SeriesGuide](https://github.com/UweTrottmann/SeriesGuide/fork) and clone your fork.
-2. See the notes about [building](#building) the app below.
+2. See the notes about [building](#building) the app below. Take the [guidelines of this project](/docs/guidelines.md) into account.
 3. Create a new branch ([using GitHub](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/)
    or the command `git checkout -b descriptive-branch-name dev`).
 4. Make [great commits](http://robots.thoughtbot.com/post/48933156625/5-useful-tips-for-a-better-commit-message). For non-trivial changes, add a copyright line at the top of the files you edited.
 5. [Start a pull request](https://github.com/UweTrottmann/SeriesGuide/compare) and reference [issues](https://github.com/UweTrottmann/SeriesGuide/issues) if needed.
 
-#### No code!
-* You can [discuss or submit bug reports](https://github.com/UweTrottmann/SeriesGuide/issues).
-* You can [suggest features](https://discuss.seriesgui.de).
-* You can [translate the app](https://crowdin.com/project/seriesguide-translations).
+**No code!**
+
+- You can [discuss or submit bug reports](https://github.com/UweTrottmann/SeriesGuide/issues).
+- You can [suggest features](https://discuss.seriesgui.de).
+- You can [translate the app](https://crowdin.com/project/seriesguide-translations).
 
 ## Building
 
-- `dev` is the main development and [test release](https://github.com/UweTrottmann/SeriesGuide/wiki/Beta) branch.
-- `main` has always the latest [stable version](https://seriesgui.de).
+- `dev` contains the latest changes.
+- `main` contains the latest stable version.
 
 To get started:
 
@@ -34,20 +38,23 @@ To get started:
 
 Debug builds should just work.
 
-### TMDB, trakt
-To add shows or movies you need to create an API key for [TMDB](https://www.themoviedb.org/settings/api) 
-and OAuth credentials for [trakt](https://trakt.tv/oauth/applications). 
+### TMDB, Trakt
+
+To add shows or movies you need to create an API key for [TMDB](https://www.themoviedb.org/settings/api)
+and OAuth credentials for [Trakt](https://trakt.tv/oauth/applications).
 Place them in `secret.properties` in the project directory (where `settings.gradle` is):
 
-```
+```text
 SG_TMDB_API_KEY=<your api key>
 SG_TRAKT_CLIENT_ID=<your trakt client id>
 SG_TRAKT_CLIENT_SECRET=<your trakt client secret>
 ```
 
 ### Release
+
 To release some additional `secret.properties` values might be necessary:
-```
+
+```text
 # Play Store in-app billing public key
 SG_IAP_KEY_A=<keypart>
 SG_IAP_KEY_B=<keypart>

README.md

@@ -5,14 +5,14 @@ Android app to help you keep track of your favorite TV shows and movies.
 </p>
 
 <p align="center">
-  <a href="https://seriesgui.de">Download</a> •
-  <a href="https://seriesgui.de/whypay">Support the dev</a> •
+  <a href="https://www.seriesgui.de">Download</a> •
+  <a href="https://www.seriesgui.de/whypay">Support the dev</a> •
   <a href="CONTRIBUTING.md">Contributing</a> •
   <a href="https://discuss.seriesgui.de/">Announcements & Help</a>
 </p>
 
 <p align="center">
-  <a href="https://seriesgui.de">
+  <a href="https://github.com/UweTrottmann/SeriesGuide/blob/main/CHANGELOG.md#release-notes">
     <img src="https://img.shields.io/github/v/release/UweTrottmann/SeriesGuide?style=flat">
   </a>
   <a href="https://github.com/UweTrottmann/SeriesGuide/actions/workflows/assemble-test-lint.yml">

RELEASING.md

@@ -1,26 +1,28 @@
 # Release process
 
-- If stable, create `release-<nr>` branch. If beta, stay on `dev`.
-- Optional: Update translations.
-- Change version code and name in [`build.gradle.kts`](/build.gradle.kts).
-- Amend [`CHANGELOG.md`](/CHANGELOG.md).
-- Deploy to test device.
-- Push to GitHub and check build succeeds, tests are green and Lint file is OK.
-
+- If it does not exist, create a `release-<minor-version>` branch
+- Merge latest changes from `dev`
+- Optional: Update translations
+- Change version code and name in [`build.gradle.kts`](/build.gradle.kts)
+- Update [`CHANGELOG.md`](/CHANGELOG.md)
+- Push to GitHub
+- If it does not exist, create a merge request against `main`
+- Check build succeeds, tests are green and lint output is as expected
 
 ## Play Store (testing + production)
 
 - `bundlePureRelease`
 - Publish to alpha channel, test.
 
 Published to beta channel:
+
 - Tag like `v12.0.3`.
 
 Published to production:
-- Download universal APK from Play Store and attach to GitHub tag.
 
+- Download universal APK from Play Store and attach to GitHub tag.
 
-## Amazon App Store (stable only)
+## Amazon App Store (production only)
 
-- `assembleAmazonRelease`
+- `bundleAmazonRelease`
 - Test update on test device.

api/build.gradle.kts

@@ -11,6 +11,11 @@ val sgCompileSdk: Int by rootProject.extra
 val sgMinSdk: Int by rootProject.extra
 val sgTargetSdk: Int by rootProject.extra
 
+tasks.withType(JavaCompile::class.java).configureEach {
+    // Suppress JDK 21 warning about deprecated, but not yet removed, source and target value 8 support
+    options.compilerArgs.add("-Xlint:-options")
+}
+
 android {
     namespace = "com.battlelancer.seriesguide.api"
     compileSdk = sgCompileSdk