From 756ae439e57d232df55441f4e928f393b088d0ba Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Tue, 7 Sep 2021 07:34:03 +0200
Subject: [PATCH] Fix maven publish with Gradle 7

---
 android/app/build.gradle       | 10 ++++++----
 android/viroar/build.gradle    | 10 ++++++----
 android/virocore/build.gradle  | 28 ++++++++++++++++++++++------
 android/viroreact/build.gradle | 10 ++++++----
 4 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index a0d1eb9c8..0126a81cf 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -41,10 +41,12 @@ dependencies {
     implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2'
 }
 
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.all {}
+project.afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+            }
         }
     }
 }
diff --git a/android/viroar/build.gradle b/android/viroar/build.gradle
index 383d23d9d..7ca349fc5 100644
--- a/android/viroar/build.gradle
+++ b/android/viroar/build.gradle
@@ -63,10 +63,12 @@ tasks.whenTaskAdded { task ->
     }
 }
 
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.all {}
+project.afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+            }
         }
     }
 }
diff --git a/android/virocore/build.gradle b/android/virocore/build.gradle
index 1d92d0a5d..204881669 100644
--- a/android/virocore/build.gradle
+++ b/android/virocore/build.gradle
@@ -81,8 +81,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "androidx.appcompat:appcompat:1.3.1"
     implementation 'com.google.android.exoplayer:exoplayer:2.13.3'
-    implementation project(':libs:gvr')
-    implementation project(':libs:arcore')
+    api project(':libs:gvr')
+    api project(':libs:arcore')
     implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2'
 }
 
@@ -98,10 +98,26 @@ tasks.whenTaskAdded {
     }
 }
 
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.all {}
+project.afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                pom {
+                    name = "viroCore"
+                    description = "Community viroCore"
+                    url = "https://github.com/ViroCommunity/virocore"
+                    licenses {
+                        license {
+                            name = "MIT License"
+                            url = "https://github.com/ViroCommunity/virocore/blob/main/LICENSE"
+                        }
+                    }
+                    // TODO This fixes missing gvr dependency with Gradle 6.x but for Gradle 7.x it needs an other solution
+                    // configurations.api.getDependencies().each { dep -> addDependency(dep, "compile") }
+                    // configurations.implementation.getDependencies().each { dep -> addDependency(dep, "runtime") }
+                }
+            }
         }
     }
 }
diff --git a/android/viroreact/build.gradle b/android/viroreact/build.gradle
index bf5f61b66..9088986f2 100644
--- a/android/viroreact/build.gradle
+++ b/android/viroreact/build.gradle
@@ -129,10 +129,12 @@ tasks.whenTaskAdded { task ->
     }
 }
 
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.all {}
+project.afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+            }
         }
     }
 }