diff --git a/artifactory-mvn-push.gradle b/artifactory-mvn-push.gradle new file mode 100644 index 00000000..934ddba3 --- /dev/null +++ b/artifactory-mvn-push.gradle @@ -0,0 +1,44 @@ +apply plugin: 'com.jfrog.artifactory' +apply plugin: 'digital.wup.android-maven-publish' + +publishing { + publications { + aar(MavenPublication) { + groupId "${GROUP}.auto1" + version VERSION_NAME + artifactId POM_ARTIFACT_ID + + from components.android + } + } +} + +artifactory { + contextUrl = artifactory_repository_url + publish { + repository { + repoKey = artifactory_repository_name + + username = artifactory_username + password = artifactory_password + } + defaults { + publications('aar') + publishArtifacts = true + + properties = ['qa.level': 'basic', 'q.os': 'android', 'dev.team': 'mobile-android'] + publishPom = true + } + } +} + +afterEvaluate { + task cleanBuildPublish { + dependsOn 'clean' + dependsOn 'assembleRelease' + dependsOn 'artifactoryPublish' + tasks.findByName('assembleRelease').mustRunAfter 'clean' + tasks.findByName('artifactoryPublish').dependsOn 'generatePomFileForAarPublication' + tasks.findByName('artifactoryPublish').mustRunAfter 'assembleRelease' + } +} \ No newline at end of file diff --git a/library-image-loader/build.gradle b/library-image-loader/build.gradle index 026b1f44..523c835e 100644 --- a/library-image-loader/build.gradle +++ b/library-image-loader/build.gradle @@ -25,6 +25,4 @@ dependencies { implementation OK_HTTP } -if (project.hasProperty('release')) { - apply from: 'https://raw.githubusercontent.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' -} \ No newline at end of file +apply from: '../artifactory-mvn-push.gradle' \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index a3073b48..6929bf08 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,9 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'com.jfrog.artifactory' -apply plugin: 'digital.wup.android-maven-publish' - android { compileSdkVersion TARGET_SDK @@ -37,47 +34,4 @@ repositories { mavenCentral() } -publishing { - publications { - aar(MavenPublication) { - groupId "${GROUP}.auto1" - version VERSION_NAME - artifactId POM_ARTIFACT_ID - - from components.android - } - } -} - -artifactory { - contextUrl = artifactory_repository - publish { - repository { - repoKey = 'libs-android-local' - - username = artifactory_username - password = artifactory_password - } - defaults { - publications('aar') - publishArtifacts = true - - properties = ['qa.level': 'basic', 'q.os': 'android', 'dev.team': 'mobile-android'] - publishPom = true - } - } -} - -afterEvaluate { - - task cleanBuildPublish { - dependsOn 'clean' - dependsOn 'assembleRelease' - dependsOn 'artifactoryPublish' - tasks.findByName('assembleRelease').mustRunAfter 'clean' - tasks.findByName('artifactoryPublish').dependsOn 'generatePomFileForAarPublication' - tasks.findByName('artifactoryPublish').mustRunAfter 'assembleRelease' - } - - cleanBuildPublish -} \ No newline at end of file +apply from: '../artifactory-mvn-push.gradle' \ No newline at end of file