From e4e572607cbcd6355bb89b7c6ee81615b33d3858 Mon Sep 17 00:00:00 2001
From: Taras <tarassmakula@gmail.com>
Date: Wed, 7 Sep 2022 16:22:19 +0300
Subject: [PATCH] Add dependencies scope
---
matrix-sdk-android/gradle-publish.gradle | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/matrix-sdk-android/gradle-publish.gradle b/matrix-sdk-android/gradle-publish.gradle
index b3072d9d..5f77c696 100644
--- a/matrix-sdk-android/gradle-publish.gradle
+++ b/matrix-sdk-android/gradle-publish.gradle
@@ -3,7 +3,7 @@ apply plugin: 'maven-publish'
def groupIdString = "org.matrix.android"
def artifactIdString = "matrix-sdk-android"
-def versionName = "1.4.27"
+def versionName = "1.4.34"
def artifactPath = "$buildDir/outputs/aar/$artifactIdString-release.aar"
def publicationName = "release"
def projectId = "16"
@@ -23,15 +23,19 @@ publishing {
artifact artifactPath
artifact sourceJar
- // To include project dependencies
pom.withXml {
- def dependencies = asNode().appendNode('dependencies')
- configurations.getByName("${publicationName}CompileClasspath").getResolvedConfiguration().getFirstLevelModuleDependencies().each {
- def dependency = dependencies.appendNode('dependency')
- dependency.appendNode('groupId', it.moduleGroup)
- dependency.appendNode('artifactId', it.moduleName)
- dependency.appendNode('version', it.moduleVersion)
+ def dependenciesNode = asNode().appendNode('dependencies')
+ ext.addDependency = { Dependency dep, String scope ->
+ if (dep.group == null || dep.version == null || dep.name == null || dep.name == "unspecified")
+ return
+ final dependencyNode = dependenciesNode.appendNode('dependency')
+ dependencyNode.appendNode('groupId', dep.group)
+ dependencyNode.appendNode('artifactId', dep.name)
+ dependencyNode.appendNode('version', dep.version)
+ dependencyNode.appendNode('scope', scope)
}
+ configurations.api.getDependencies().each { dep -> addDependency(dep, "compile") }
+ configurations.implementation.getDependencies().each { dep -> addDependency(dep, "runtime") }
}
}
}
--
GitLab