Merge pull request #334 from marverenic/m/bump-version

Bump version and prepare for 3.0 beta 1 release
marverenic · Feb 1, 2018 · af3d923 · af3d923
2 parents 6064c1a + 4be39b0
commit af3d923
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,8 +44,8 @@ android {
         applicationId "com.marverenic.music"
         minSdkVersion 16
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 40318
-        versionName "2.2"
+        versionCode 40319
+        versionName "3.0 beta 1"
         resConfigs "en", "es"
     }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,10 +10,10 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" /> <!-- Used to play music when the device is locked -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <!-- Used to add themed icons to the launcher -->
 
-    <permission android:name="com.marverenic.music.player.BROADCAST_PERMISSION"
+    <permission android:name="${applicationId}.MUSIC_BROADCAST_PERMISSION"
         android:protectionLevel="signature"/>
 
-    <uses-permission android:name="com.marverenic.music.player.BROADCAST_PERMISSION"/>
+    <uses-permission android:name="${applicationId}.MUSIC_BROADCAST_PERMISSION"/>
 
     <supports-screens
         android:largeScreens="true"

diff --git a/app/src/main/java/com/marverenic/music/player/MusicPlayer.java b/app/src/main/java/com/marverenic/music/player/MusicPlayer.java
@@ -20,6 +20,7 @@
 import android.support.v4.media.session.PlaybackStateCompat;
 import android.view.KeyEvent;
 
+import com.marverenic.music.BuildConfig;
 import com.marverenic.music.JockeyApplication;
 import com.marverenic.music.R;
 import com.marverenic.music.data.store.MediaStoreUtil;
@@ -82,7 +83,7 @@ public class MusicPlayer implements AudioManager.OnAudioFocusChangeListener,
     /**
      * Package permission that is required to receive broadcasts
      */
-    private static final String BROADCAST_PERMISSION = "com.marverenic.music.player.BROADCAST_PERMISSION";
+    private static final String BROADCAST_PERMISSION = BuildConfig.APPLICATION_ID + ".MUSIC_BROADCAST_PERMISSION";
 
     /**
      * An {@link Intent} action broadcasted when a MusicPlayer has changed its state automatically