Merge pull request #20 from newrelic/hotfix/jitpack_issue

Fix JitPack issue
newrelic · Oct 24, 2023 · 5b73a5f · 5b73a5f
2 parents e2fbb9f + dfa2bc2
commit 5b73a5f
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 17 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/NRExoPlayerTracker/build.gradle b/NRExoPlayerTracker/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'maven-publish'
 }
 
 android {
@@ -8,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 33
-        versionCode 2
-        versionName "1.0.2"
+        versionCode 3
+        versionName "1.0.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -46,3 +47,16 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                groupId = 'com.github.newrelic'
+                artifactId = 'NRExoPlayerTracker'
+                version = "${android.defaultConfig.versionName}"
+            }
+        }
+    }
+}
diff --git a/NRIMATracker/build.gradle b/NRIMATracker/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'maven-publish'
 }
 
 android {
@@ -8,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 33
-        versionCode 2
-        versionName "1.0.2"
+        versionCode 3
+        versionName "1.0.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -46,3 +47,16 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                groupId = 'com.github.newrelic'
+                artifactId = 'NRIMATracker'
+                version = "${android.defaultConfig.versionName}"
+            }
+        }
+    }
+}
diff --git a/NewRelicVideoCore/build.gradle b/NewRelicVideoCore/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'maven-publish'
 }
 
 android {
@@ -8,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 33
-        versionCode 5
-        versionName "1.0.2"
+        versionCode 6
+        versionName "1.0.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -45,3 +46,16 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                groupId = 'com.github.newrelic'
+                artifactId = 'NewRelicVideoCore'
+                version = "${android.defaultConfig.versionName}"
+            }
+        }
+    }
+}
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.newrelic.nrvideoproject"
         minSdkVersion 16
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,8 +11,9 @@
         <activity
             android:name=".VideoPlayerAds"
             android:label="@string/title_activity_video_player_ads"
-            android:theme="@style/Theme.NRVideoProject.NoActionBar"></activity>
-        <activity android:name=".VideoPlayer" />
+            android:theme="@style/Theme.NRVideoProject.NoActionBar"
+            android:exported="false"></activity>
+        <activity android:name=".VideoPlayer" android:exported="false" />
         <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/newrelic/nrvideoproject/VideoPlayer.java b/app/src/main/java/com/newrelic/nrvideoproject/VideoPlayer.java
@@ -2,7 +2,7 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.media3.common.MediaItem;
-import androidx.media3.exoplayer.SimpleExoPlayer;
+import androidx.media3.exoplayer.ExoPlayer;
 import androidx.media3.ui.PlayerView;
 
 import android.os.Bundle;
@@ -16,7 +16,7 @@
 
 public class VideoPlayer extends AppCompatActivity {
 
-    private SimpleExoPlayer player;
+    private ExoPlayer player;
     private Integer trackerId;
 
     @Override
@@ -55,7 +55,7 @@ protected void onDestroy() {
     }
 
     private void playVideo(String videoUrl) {
-        player = new SimpleExoPlayer.Builder(this).build();
+        player = new ExoPlayer.Builder(this).build();
 
         NRTrackerExoPlayer tracker = new NRTrackerExoPlayer();
 

diff --git a/build.gradle b/build.gradle
@@ -2,8 +2,8 @@
 buildscript {
     repositories {
         google()
-        jcenter()
         mavenCentral()
+        maven { url "https://jitpack.io" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.2'
@@ -14,10 +14,13 @@ buildscript {
     }
 }
 
+// Necessary??
+apply plugin: 'maven-publish'
+
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11