From 4d3eff963034dc8b793903ab31e1292e6aad5692 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Fri, 19 Jul 2024 10:48:01 +0200
Subject: [PATCH] add jitpack compatebillity sixth try: fix testapp namespace
 and put publication into gradle root

---
 build.gradle.kts                                 | 16 +++++++++++++++-
 new-player/build.gradle.kts                      | 15 ---------------
 test-app/build.gradle.kts                        |  8 ++++----
 .../newplayer/{ => testapp}/MainActivity.kt      |  2 +-
 .../newplayer/{ => testapp}/NewPlayerApp.kt      |  2 +-
 5 files changed, 21 insertions(+), 22 deletions(-)
 rename test-app/src/main/java/net/newpipe/newplayer/{ => testapp}/MainActivity.kt (97%)
 rename test-app/src/main/java/net/newpipe/newplayer/{ => testapp}/NewPlayerApp.kt (92%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8d3fc9f..226f6fb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,4 +26,18 @@ plugins {
     alias(libs.plugins.kotlinParcelize) apply false
     alias(libs.plugins.composeCompiler) apply false
     alias(libs.plugins.android.library) apply false
-}
\ No newline at end of file
+    `maven-publish`
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            create<MavenPublication>("release") {
+                groupId = "com.github.the-scrabi"
+                artifactId = "NewPlayer"
+                version = "0.1-DEVEL"
+            }
+        }
+    }
+}
+
diff --git a/new-player/build.gradle.kts b/new-player/build.gradle.kts
index 409395e..1aa941e 100644
--- a/new-player/build.gradle.kts
+++ b/new-player/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
     alias(libs.plugins.androidHilt)
     alias(libs.plugins.kotlinParcelize)
     alias(libs.plugins.composeCompiler)
-    `maven-publish`
 }
 
 android {
@@ -46,20 +45,6 @@ android {
     }
 }
 
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            groupId = "com.github.the-scrabi"
-            artifactId = "NewPlayer"
-            version = "0.1-DEVEL"
-
-            afterEvaluate {
-                from(components["release"])
-            }
-        }
-    }
-}
-
 dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
diff --git a/test-app/build.gradle.kts b/test-app/build.gradle.kts
index fc1bce6..40f5395 100644
--- a/test-app/build.gradle.kts
+++ b/test-app/build.gradle.kts
@@ -28,7 +28,7 @@ plugins {
 }
 
 android {
-    namespace = "net.newpipe.newplayer"
+    namespace = "net.newpipe.newplayer.testapp"
     compileSdk = 34
 
     buildFeatures {
@@ -43,7 +43,7 @@ android {
     }
 
     defaultConfig {
-        applicationId = "net.newpipe.newplayer"
+        applicationId = "net.newpipe.newplayer.testapp"
         minSdk = 21
         targetSdk = 34
         versionCode = 1
@@ -103,10 +103,10 @@ dependencies {
     implementation(libs.androidx.hilt.navigation.compose)
 
     // development impl
-    //implementation(project(":new-player"))
+    implementation(project(":new-player"))
 
     //jitpack test
-    implementation(libs.newplayer)
+    //implementation(libs.newplayer)
 
     ksp(libs.hilt.android.compiler)
     ksp(libs.androidx.hilt.compiler)
diff --git a/test-app/src/main/java/net/newpipe/newplayer/MainActivity.kt b/test-app/src/main/java/net/newpipe/newplayer/testapp/MainActivity.kt
similarity index 97%
rename from test-app/src/main/java/net/newpipe/newplayer/MainActivity.kt
rename to test-app/src/main/java/net/newpipe/newplayer/testapp/MainActivity.kt
index bc043ef..8a2a59c 100644
--- a/test-app/src/main/java/net/newpipe/newplayer/MainActivity.kt
+++ b/test-app/src/main/java/net/newpipe/newplayer/testapp/MainActivity.kt
@@ -18,7 +18,7 @@
  * along with NewPlayer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.newpipe.newplayer
+package net.newpipe.newplayer.testapp
 
 import android.content.res.Configuration
 import android.os.Bundle
diff --git a/test-app/src/main/java/net/newpipe/newplayer/NewPlayerApp.kt b/test-app/src/main/java/net/newpipe/newplayer/testapp/NewPlayerApp.kt
similarity index 92%
rename from test-app/src/main/java/net/newpipe/newplayer/NewPlayerApp.kt
rename to test-app/src/main/java/net/newpipe/newplayer/testapp/NewPlayerApp.kt
index 5663b4b..a83dc75 100644
--- a/test-app/src/main/java/net/newpipe/newplayer/NewPlayerApp.kt
+++ b/test-app/src/main/java/net/newpipe/newplayer/testapp/NewPlayerApp.kt
@@ -18,7 +18,7 @@
  * along with NewPlayer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.newpipe.newplayer
+package net.newpipe.newplayer.testapp
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp