diff --git a/build.gradle b/build.gradle index ab45727..6128df5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,24 +1,16 @@ apply plugin: "groovy" apply plugin: "maven" -apply plugin: "com.novoda.bintray-release" - -def versionName = "1.5.0" -def pomGroupId = "co.ab180" -def pomArtifactId = "fatjar" - -sourceCompatibility = 1.7 buildscript { repositories { - jcenter() + } dependencies { - classpath "com.novoda:bintray-release:0.9.2" + } } repositories { - jcenter() google() mavenCentral() } @@ -28,32 +20,5 @@ dependencies { implementation localGroovy() implementation "com.android.tools.build:gradle:3.4.1" implementation "org.zeroturnaround:zt-zip:1.13" - implementation "com.g00fy2:versioncompare:1.3.4" -} - -uploadArchives { - repositories { - mavenDeployer { - repository(url: uri("$rootDir/mavenlocal")) - pom { - groupId = pomGroupId - artifactId = pomArtifactId - version = versionName - } - } - } -} - -publish { - autoPublish = true - // Bintray repo settings - userOrg = "ab180" - repoName = "gradle-plugin" - uploadName = "fatjar" - publishVersion = versionName - desc = "Gradle Fatjar Plugin" - website = "https://github.com/ab180/fat-jar" - // POM settings - groupId = pomGroupId - artifactId = pomArtifactId + implementation "io.github.g00fy2:versioncompare:1.4.1" } \ No newline at end of file diff --git a/src/main/groovy/co/ab180/fatjar/FatJarProcessor.groovy b/src/main/groovy/co/ab180/fatjar/FatJarProcessor.groovy index 7f3f46f..8dcab00 100644 --- a/src/main/groovy/co/ab180/fatjar/FatJarProcessor.groovy +++ b/src/main/groovy/co/ab180/fatjar/FatJarProcessor.groovy @@ -1,7 +1,7 @@ package co.ab180.fatjar import com.android.build.gradle.api.LibraryVariant -import com.g00fy2.versioncompare.Version +import io.github.g00fy2.versioncompare.Version import com.tonicsystems.jarjar.Rule import org.gradle.api.Project import org.gradle.api.Task diff --git a/src/main/groovy/co/ab180/fatjar/FileUtils.groovy b/src/main/groovy/co/ab180/fatjar/FileUtils.groovy index a888759..0910fa7 100644 --- a/src/main/groovy/co/ab180/fatjar/FileUtils.groovy +++ b/src/main/groovy/co/ab180/fatjar/FileUtils.groovy @@ -1,7 +1,7 @@ package co.ab180.fatjar import com.android.build.gradle.api.LibraryVariant -import com.g00fy2.versioncompare.Version +import io.github.g00fy2.versioncompare.Version import org.gradle.api.Project class FileUtils { diff --git a/src/main/groovy/co/ab180/fatjar/PathUtils.groovy b/src/main/groovy/co/ab180/fatjar/PathUtils.groovy index 4cf296b..06e0155 100644 --- a/src/main/groovy/co/ab180/fatjar/PathUtils.groovy +++ b/src/main/groovy/co/ab180/fatjar/PathUtils.groovy @@ -1,7 +1,7 @@ package co.ab180.fatjar import com.android.build.gradle.api.LibraryVariant -import com.g00fy2.versioncompare.Version +import io.github.g00fy2.versioncompare.Version class PathUtils { diff --git a/src/main/groovy/co/ab180/fatjar/TaskUtils.groovy b/src/main/groovy/co/ab180/fatjar/TaskUtils.groovy index 23ae996..cef050c 100644 --- a/src/main/groovy/co/ab180/fatjar/TaskUtils.groovy +++ b/src/main/groovy/co/ab180/fatjar/TaskUtils.groovy @@ -1,7 +1,7 @@ package co.ab180.fatjar import com.android.build.gradle.api.LibraryVariant -import com.g00fy2.versioncompare.Version +import io.github.g00fy2.versioncompare.Version import com.tonicsystems.jarjar.MainProcessor import com.tonicsystems.jarjar.Rule import com.tonicsystems.jarjar.util.StandaloneJarProcessor