diff --git a/build.gradle b/build.gradle index 9e66544..90f4764 100644 --- a/build.gradle +++ b/build.gradle @@ -7,15 +7,13 @@ buildscript { google() mavenCentral() jcenter() + mavenLocal() + } dependencies { classpath 'com.android.tools.build:gradle:4.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - // bintray with Gradle 6.0+ https://github.com/panpf/bintray-publish - classpath 'com.github.panpf.bintray-publish:bintray-publish:1.0.0' - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files } } @@ -24,6 +22,7 @@ allprojects { google() mavenCentral() maven { url 'https://jitpack.io' } + mavenLocal() } tasks.withType(Javadoc).all { diff --git a/gradle.properties b/gradle.properties index 941d968..ec79977 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,5 +23,5 @@ kotlin.code.style=official # bintray upload USER_ORG=vitaviva ARTIFACT_GROUP=com.github.fragivity -ARTIFACT_VERSION=0.2.6.2 +ARTIFACT_VERSION=0.2.6.3 WEB_SITE=https://github.com/vitaviva/fragivity diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle deleted file mode 100644 index 1bcc317..0000000 --- a/gradle/bintray.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply plugin: 'com.github.panpf.bintray-publish' - -publish { - userOrg = USER_ORG - groupId = ARTIFACT_GROUP - artifactId = ARTIFACT_NAME - publishVersion = ARTIFACT_VERSION - desc = 'Use Fragment like Activity' - website = 'https://github.com/vitaviva/fragivity' -} \ No newline at end of file diff --git a/gradle/publish.gradle b/gradle/publish.gradle new file mode 100644 index 0000000..3848074 --- /dev/null +++ b/gradle/publish.gradle @@ -0,0 +1,22 @@ +apply plugin: 'maven-publish' + + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + from components.release + groupId = ARTIFACT_GROUP + artifactId = ARTIFACT_NAME + version = ARTIFACT_VERSION + } + + debug(MavenPublication) { + from components.debug + groupId = ARTIFACT_GROUP + artifactId = ARTIFACT_NAME + version = ARTIFACT_VERSION + } + } + } +} \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index 71b4b69..a3b75c5 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -58,4 +58,18 @@ configurations.all { } } -apply from: rootProject.file("gradle/bintray.gradle") \ No newline at end of file + +apply from: rootProject.file("gradle/publish.gradle") + + + +//publish { +// userOrg = USER_ORG +// groupId = ARTIFACT_GROUP +// artifactId = ARTIFACT_NAME +// publishVersion = ARTIFACT_VERSION +// desc = 'Use Fragment like Activity' +// website = 'https://github.com/vitaviva/fragivity' +//} + +//apply from: rootProject.file("gradle/bintray.gradle") \ No newline at end of file diff --git a/processor/build.gradle b/processor/build.gradle index 3d6fb6a..ea2c533 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -15,5 +15,3 @@ dependencies { sourceCompatibility = 1.7 targetCompatibility = 1.7 - -apply from: rootProject.file("gradle/bintray.gradle") \ No newline at end of file