Skip to content

Commit 28ffb68

Browse files
author
Marcel Schnelle
authored
Cleanup deployment flow & avoid duplicate classifier artifacts (#60)
1 parent 1567b56 commit 28ffb68

File tree

3 files changed

+1
-10
lines changed

3 files changed

+1
-10
lines changed

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ buildscript {
1212
classpath "com.android.tools.build:gradle:$ANDROID_PLUGIN_VERSION"
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
1414
classpath "org.junit.platform:junit-platform-gradle-plugin:$JUNIT_PLATFORM_VERSION"
15-
classpath "com.github.dcendents:android-maven-gradle-plugin:$DCENDENTS_MAVEN_PLUGIN_VERSION"
1615
classpath "digital.wup:android-maven-publish:$ANDROID_MAVEN_PLUGIN_VERSION"
1716
}
1817
}

gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ BINTRAY_PLUGIN_VERSION = 1.8.0
3737
SHADOW_PLUGIN_VERSION = 2.0.1
3838
VERSIONS_PLUGIN_VERSION = 0.17.0
3939
ANDROID_MAVEN_PLUGIN_VERSION = 3.3.0
40-
DCENDENTS_MAVEN_PLUGIN_VERSION = 2.0
4140

4241
# Dependency versions (languages)
4342
GROOVY_VERSION = 3.0.0-alpha-1
44-
KOTLIN_VERSION = 1.2.20
43+
KOTLIN_VERSION = 1.2.21
4544

4645
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4746
# A Note to my forgetful self:

gradle/deployment.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ if (!["java", "android"].contains(targetPlatform)) {
6565
apply plugin: "com.jfrog.bintray"
6666

6767
if (targetPlatform == "java") {
68-
apply plugin: "maven"
6968
apply plugin: "maven-publish"
7069
} else if (targetPlatform == "android") {
71-
apply plugin: "com.github.dcendents.android-maven"
7270
apply plugin: "digital.wup.android-maven-publish"
7371
}
7472

@@ -106,11 +104,6 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
106104
from javadoc.destinationDir
107105
}
108106

109-
artifacts {
110-
archives sourcesJar
111-
archives javadocJar
112-
}
113-
114107
// ------------------------------------------------------------------------------------------------
115108
// Publication Configuration
116109
// ------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)