diff --git a/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt b/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt index 5f424cb7376ad7b33c750060dd1a205190ccb0d0..7db2ae17d887c921051a96a41e4e15474a306047 100644 --- a/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt +++ b/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt @@ -24,18 +24,18 @@ class AndroidApplicationConvention : Plugin<Project> { applicationId = "${rootProject.group}.${rootProject.name.lowercase(Locale.ROOT)}" - val commit = git("rev-parse", "HEAD") - val name = git("describe", "--always", "--tags", "HEAD") + val commit = rootProject.git("rev-parse", "HEAD") + val name = rootProject.git("describe", "--always", "--tags", "HEAD") - versionCode = git("rev-list", "--count", "HEAD")?.toIntOrNull() ?: 1 - versionName = git("describe", "--always", "--tags", "HEAD") ?: "1.0.0" + versionCode = rootProject.git("rev-list", "--count", "HEAD")?.toIntOrNull() ?: 1 + versionName = rootProject.git("describe", "--always", "--tags", "HEAD") ?: "1.0.0" val fancyVersionName = if (commit == null || name == null) name else "<a href=\\\"https://git.kuschku.de/justJanne/QuasselDroid-ng/commit/$commit\\\">$name</a>" - buildConfigField("String", "GIT_HEAD", "\"${git("rev-parse", "HEAD") ?: ""}\"") + buildConfigField("String", "GIT_HEAD", "\"${rootProject.git("rev-parse", "HEAD") ?: ""}\"") buildConfigField("String", "FANCY_VERSION_NAME", "\"${fancyVersionName ?: ""}\"") - buildConfigField("long", "GIT_COMMIT_DATE", "${git("show", "-s", "--format=%ct") ?: 0}L") + buildConfigField("long", "GIT_COMMIT_DATE", "${rootProject.git("show", "-s", "--format=%ct") ?: 0}L") signingConfig = signingConfigs.findByName("default")