Skip to content

Commit

Permalink
Merge branch 'release/0.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
s-frei committed Mar 26, 2024
2 parents 82e75e5 + a3b0af1 commit 41c00c4
Show file tree
Hide file tree
Showing 45 changed files with 730 additions and 584 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,13 @@ updates:
open-pull-requests-limit: 25
reviewers:
- "s-frei"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
time: "06:00"
timezone: "Europe/Berlin"
target-branch: "develop"
open-pull-requests-limit: 10
reviewers:
- "s-frei"
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- name: "Dependabot metadata"
id: dependabot-metadata
uses: dependabot/fetch-metadata@v1
uses: dependabot/fetch-metadata@v2

- name: "Enable auto-merge for Dependabot PRs"
if: ${{steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch'}}
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/functionality-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:

- name: "Checkout master"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: "master"

Expand All @@ -26,20 +26,24 @@ jobs:
echo "BRANCH_NAME: ${BRANCH_NAME}"
echo "RUN_DATE: ${RUN_DATE}"
- name: "Setup JDK 11"
uses: actions/setup-java@v3
- name: "Setup JDK 17"
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
java-version: 17
architecture: x64
cache: maven

- name: "Run Maven 'test'"
run: mvn test -e -P fancy-report --color always

- name: "Upload test report"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-report-${{ env.COMMIT_SHA_ABREV }}-${{ env.RUN_DATE }}
path: library/target/surefire-reports/
path: target/surefire-reports/

- name: "Publish Test Report"
if: success() || failure()
uses: scacap/action-surefire-report@v1
8 changes: 4 additions & 4 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup JDK 11"
uses: actions/setup-java@v3
- name: "Setup JDK 17"
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
java-version: 17
architecture: x64
cache: maven

Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/maven-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup environment"
shell: bash
Expand All @@ -24,20 +24,24 @@ jobs:
echo "BRANCH_NAME: ${BRANCH_NAME}"
echo "RUN_DATE: ${RUN_DATE}"
- name: "Setup JDK 11"
uses: actions/setup-java@v3
- name: "Setup JDK 17"
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
java-version: 17
architecture: x64
cache: maven

- name: "Run Maven 'test'"
run: mvn test -e -P fancy-report --color always

- name: "Upload test report"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-report-${{ env.COMMIT_SHA_ABREV }}-${{ env.RUN_DATE }}
path: library/target/surefire-reports/
path: target/surefire-reports/

- name: "Publish Test Report"
if: success() || failure()
uses: scacap/action-surefire-report@v1
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=11.0.19-tem
java=17.0.10-tem
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
Changelog
=========

0.9.0
-----

**Breaking:**

- Bump to JDK 17

**Features:**

- Get tracks by URL
- Improved tests
- Updated dependencies

**Bugfix:**

- Fix YouTube tracks parsing

0.8.2
-----

Expand Down
15 changes: 12 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,13 @@ Maven dependency available on [Maven Central](https://search.maven.org/artifact/
<dependency>
<groupId>io.sfrei</groupId>
<artifactId>tracksearch</artifactId>
<version>0.8.2</version>
<version>0.9.0</version>
</dependency>
```

or from [GitHub Packages](https://github.com/s-frei/TrackSearch/packages) or directly from
[GitHub Releases](https://github.com/s-frei/TrackSearch/releases).

### Getting started

For more information check the related interface documentation.
Expand All @@ -76,13 +79,19 @@ MultiTrackSearchClient searchClient = new MultiSearchClient();
TrackSearchClient<SoundCloudTrack> explicitClient = new SoundCloudClient();

// Search for tracks
TrackList<Track> tracksForSearch = searchClient.getTracksForSearch("your keywords")
TrackList<Track> tracksForSearch = searchClient.getTracksForSearch("your keywords");

// Get the audio stream
String streamUrl = tracksForSearch.get(anyPos).getStreamUrl();

// Get next tracks page
TrackList<Track> nextTracks = tracksForSearch.next();

// Get a track for URL
Track trackForURL = searchClient.getTrack("URL");

// Get the audio stream (retrying on failure)
searchClient.getStreamUrl(trackForURL, TrackSearchConfig.DEFAULT_RESOLVING_RETIRES);
```

## Why is this done ?
Expand All @@ -92,7 +101,7 @@ abused for this, or it wasn't written in Java.

## Develop :hammer:

**Note:** **JDK 11** is required!
**Note:** **JDK 17** is required! (`sdk env install`)

Fire up following in your shell:

Expand Down
Loading

0 comments on commit 41c00c4

Please sign in to comment.