Skip to content

Commit 82e5f46

Browse files
xdev-gh-botxdev-gh-bot
committed
Merge branch 'develop' into update-from-template-merged
2 parents 47db532 + b911007 commit 82e5f46

37 files changed

+1571
-129
lines changed

‎.github/FUNDING.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
custom:
2+
- https://incompetech.com/donate.html
3+
- https://xiph.org/donate

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ body:
1515
attributes:
1616
label: "Checklist"
1717
options:
18-
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
18+
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/music-maven-plugin/releases/latest)"
1919
required: true
20-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
20+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/music-maven-plugin/issues) or [closed](https://github.com/xdev-software/music-maven-plugin/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
2121
required: true
2222
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
2323
required: true

‎.github/ISSUE_TEMPLATE/enhancement.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body:
1313
attributes:
1414
label: "Checklist"
1515
options:
16-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
16+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/music-maven-plugin/issues) or [closed](https://github.com/xdev-software/music-maven-plugin/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1717
required: true
1818
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
1919
required: true

‎.github/ISSUE_TEMPLATE/question.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
attributes:
1313
label: "Checklist"
1414
options:
15-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
15+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/music-maven-plugin/issues) or [closed](https://github.com/xdev-software/music-maven-plugin/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1616
required: true
1717
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
1818
required: true

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ jobs:
103103
## Installation
104104
Add the following lines to your pom:
105105
```XML
106-
<dependency>
106+
<plugin>
107107
<groupId>software.xdev</groupId>
108108
<artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
109109
<version>${{ steps.version.outputs.release }}</version>
110-
</dependency>
110+
</plugin>
111111
```
112112
113113
publish-maven:

‎.run/Run Demo.run.xml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.run/Run Maven Demo (Spotify).run.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run Maven Demo (Spotify)" type="MavenRunConfiguration" factoryName="Maven">
3+
<MavenSettings>
4+
<option name="myGeneralSettings" />
5+
<option name="myRunnerSettings" />
6+
<option name="myRunnerParameters">
7+
<MavenRunnerParameters>
8+
<option name="cmdOptions" />
9+
<option name="profiles">
10+
<set />
11+
</option>
12+
<option name="goals">
13+
<list>
14+
<option value="install" />
15+
</list>
16+
</option>
17+
<option name="multimoduleDir" />
18+
<option name="pomFileName" />
19+
<option name="profilesMap">
20+
<map>
21+
<entry key="spotify" value="true" />
22+
</map>
23+
</option>
24+
<option name="projectsCmdOptionValues">
25+
<list />
26+
</option>
27+
<option name="resolveToWorkspace" value="false" />
28+
<option name="workingDirPath" value="$PROJECT_DIR$" />
29+
</MavenRunnerParameters>
30+
</option>
31+
</MavenSettings>
32+
<method v="2" />
33+
</configuration>
34+
</component>

‎.run/Run Maven Demo.run.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run Maven Demo" type="MavenRunConfiguration" factoryName="Maven">
3+
<MavenSettings>
4+
<option name="myGeneralSettings" />
5+
<option name="myRunnerSettings" />
6+
<option name="myRunnerParameters">
7+
<MavenRunnerParameters>
8+
<option name="cmdOptions" />
9+
<option name="profiles">
10+
<set />
11+
</option>
12+
<option name="goals">
13+
<list>
14+
<option value="install" />
15+
</list>
16+
</option>
17+
<option name="multimoduleDir" />
18+
<option name="pomFileName" />
19+
<option name="profilesMap">
20+
<map />
21+
</option>
22+
<option name="projectsCmdOptionValues">
23+
<list />
24+
</option>
25+
<option name="resolveToWorkspace" value="false" />
26+
<option name="workingDirPath" value="$PROJECT_DIR$" />
27+
</MavenRunnerParameters>
28+
</option>
29+
</MavenSettings>
30+
<method v="2" />
31+
</configuration>
32+
</component>

‎CHANGELOG.md‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# 2.0.0
2+
_This release contains breaking changes_
3+
4+
* Redesigned the project to make it easier to implement custom music sources / players
5+
* Added support for Spotify #41 @aboullaite
6+
7+
New configuration format in ``pom.xml``:
8+
9+
Old:
10+
```xml
11+
<configuration>
12+
<sources>
13+
<musicSource>
14+
<uri>https://incompetech.com/music/royalty-free/mp3-royaltyfree/Corncob.mp3</uri>
15+
</musicSource>
16+
<musicSource>
17+
<file>my_cool_music.mp3</file>
18+
</musicSource>
19+
<musicSource>
20+
<classpath>/default/Andrew_Codeman_-_03_-_Mussels_short_version.ogg</classpath>
21+
</musicSource>
22+
</sources>
23+
<shuffle>true</shuffle>
24+
</configuration>
25+
```
26+
New:
27+
```xml
28+
<configuration>
29+
<sources>
30+
<source>
31+
<uri>
32+
<uri>https://incompetech.com/music/royalty-free/mp3-royaltyfree/Corncob.mp3</uri>
33+
</uri>
34+
</source>
35+
<source>
36+
<file>
37+
<file>my_cool_music.mp3</file>
38+
</file>
39+
</source>
40+
<source>
41+
<classpath>
42+
<classpath>/default/Andrew_Codeman_-_03_-_Mussels_short_version.ogg</classpath>
43+
</classpath>
44+
</source>
45+
<source>
46+
<spotify>
47+
<uri>spotify:track:4cOdK2wGLETKBW3PvgPWqT</uri>
48+
</spotify>
49+
</source>
50+
</sources>
51+
</configuration>
52+
```
53+
54+
# 1.0.3
55+
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
56+
* Updated dependencies
57+
58+
# 1.0.2
59+
* Added a property which allows disabling the plugin #11 @runeflobakk
60+
> enables the troller to subtly disable accidentally blasting the music in the office space while waiting for the trollees to be trolled, while avoiding being self-trolled
61+
62+
# 1.0.1
63+
* Updated dependencies
64+
65+
# 1.0.0
66+
_Initial release_

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ You should have the following things installed:
3434
* Ensure that the JDK/Java-Version is correct
3535

3636

37-
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/release.yml?branch=master)](https://github.com/xdev-software/template-placeholder/actions/workflows/release.yml)
37+
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/music-maven-plugin/release.yml?branch=master)](https://github.com/xdev-software/music-maven-plugin/actions/workflows/release.yml)
3838

3939
Before releasing:
40-
* Consider doing a [test-deployment](https://github.com/xdev-software/template-placeholder/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
40+
* Consider doing a [test-deployment](https://github.com/xdev-software/music-maven-plugin/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
4141
* Check the [changelog](CHANGELOG.md)
4242

4343
If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes

0 commit comments

Comments
 (0)