Merge branch 'cawc-master'

kkevinm · May 30, 2020 · 86807d4 · 86807d4
2 parents 5155434 + 158cdd3
commit 86807d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.kevinmussi</groupId>
     <artifactId>itunes-discord-rp</artifactId>
-    <version>1.3</version>
+    <version>1.3.1</version>
     <packaging>jar</packaging>
     <name>iTunes Discord RP</name>
     <properties>
@@ -19,7 +19,7 @@
         <repository>
             <id>jcenter</id>
             <name>jcenter-bintray</name>
-            <url>http://jcenter.bintray.com</url>
+            <url>https://jcenter.bintray.com</url>
         </repository>
     </repositories>
     <dependencies>
@@ -39,7 +39,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
@@ -48,7 +48,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -65,7 +65,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.3</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -151,7 +151,7 @@
                         <bundledJreAsFallback>false</bundledJreAsFallback>
                     </jre>
                     <versionInfo>
-                        <fileVersion>${project.version}.0.0</fileVersion>
+                        <fileVersion>${project.version}.0</fileVersion>
                         <txtFileVersion>${project.version}</txtFileVersion>
                         <fileDescription>${project.description}</fileDescription>
                         <copyright>Copyright (c) 2018</copyright>

diff --git a/src/main/resources/scripts/macos/itunes_track_info_script.applescript b/src/main/resources/scripts/macos/itunes_track_info_script.applescript
@@ -28,8 +28,8 @@ repeat
                         log state
                     end if
                 else
-                    set currentTrack to current track
-                    
+                	set currentTrack to current track
+                	
                     # If the current song or the player status has changed, log the new track information
                     if currentPlayerState is not savedPlayerState or currentTrack is not savedTrack then
                         if currentPlayerState is playing then
@@ -39,7 +39,7 @@ repeat
                         end if
 
                         # Write the track main information in the log
-                        log name of currentTrack & ";;" & artist of currentTrack & ";;" & album of currentTrack & ";;" & state & ";;" & player position & ";;" & duration of currentTrack & ";;" & track number of currentTrack & ";;" & track count of currentTrack
+                        log name of current track & ";;" & artist of current track & ";;" & album of current track & ";;" & state & ";;" & player position & ";;" & duration of current track & ";;" & track number of current track & ";;" & track count of current track
                     end if
 
                     # Update the player state and song name to detect when the track changes

diff --git a/src/main/resources/scripts/macos15/itunes_track_info_script.applescript b/src/main/resources/scripts/macos15/itunes_track_info_script.applescript
@@ -28,8 +28,8 @@ repeat
                         log state
                     end if
                 else
-                    set currentTrack to current track
-                    
+                	set currentTrack to current track
+                	
                     # If the current song or the player status has changed, log the new track information
                     if currentPlayerState is not savedPlayerState or currentTrack is not savedTrack then
                         if currentPlayerState is playing then
@@ -39,7 +39,7 @@ repeat
                         end if
 
                         # Write the track main information in the log
-                        log name of currentTrack & ";;" & artist of currentTrack & ";;" & album of currentTrack & ";;" & state & ";;" & player position & ";;" & duration of currentTrack & ";;" & track number of currentTrack & ";;" & track count of currentTrack
+                        log name of current track & ";;" & artist of current track & ";;" & album of current track & ";;" & state & ";;" & player position & ";;" & duration of current track & ";;" & track number of current track & ";;" & track count of current track
                     end if
 
                     # Update the player state and song name to detect when the track changes