diff --git a/.circleci/config.yml b/.circleci/config.yml index 22e9dd6..00dd408 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,9 +26,6 @@ jobs: - run: name: Run Detekt command: ./gradlew detekt - - run: - name: Run FindBugs - command: ./gradlew findbugs - run: name: Run Pmd command: ./gradlew pmd diff --git a/build.gradle b/build.gradle index 1cf829a..91e7977 100644 --- a/build.gradle +++ b/build.gradle @@ -30,28 +30,11 @@ allprojects { } apply from: "$rootDir/scripts/detekt.gradle" apply from: "$rootDir/scripts/ktlint.gradle" - apply from: "$rootDir/scripts/findbugs.gradle" apply from: "$rootDir/scripts/pmd.gradle" } subprojects { Project project -> if (project.name.startsWith('mvi')) { - apply plugin: 'com.jfrog.bintray' - apply plugin: 'maven-publish' - project.afterEvaluate { - publishing { - repositories { - maven { - def releasesRepoUrl = "https://dl.bintray.com/valueadd-poland/maven" - def snapshotsRepoUrl = "https://dl.bintray.com/valueadd-poland/snapshots" - url = islibraryVersionSnapshot - ? snapshotsRepoUrl - : releasesRepoUrl - println("Repository url is $url") - } - } - } - } } } \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index 7274942..a24d8c4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,7 +8,7 @@ ext.deps = deps * Version variables. */ def versions = [:] -versions.android_gradle_plugin = "3.6.1" +versions.android_gradle_plugin = "4.1.0" versions.androidx_appcompat = "1.0.2" versions.androidx_constraint = "1.1.3" versions.androidx_material = "1.0.0" @@ -63,7 +63,7 @@ versions.fragmentation = "1.0.1" versions.material_progress_bar = "1.6.1" versions.fast_adapter = "4.0.1" versions.mockk = "1.9.3" -versions.junit5_runner = "1.3.2.0" +versions.junit5_runner = "1.6.2.0" versions.android_maven = "1.4.1" versions.bintray = "1.7.3" deps.versions = versions diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9b945ee..24688ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Feb 04 09:10:28 CET 2020 +#Tue Oct 20 08:42:56 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/mvi-presenter/build.gradle b/mvi-presenter/build.gradle index 03ac5a4..81d6631 100644 --- a/mvi-presenter/build.gradle +++ b/mvi-presenter/build.gradle @@ -6,6 +6,7 @@ apply from: 'publish.gradle' java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 + withSourcesJar() } // Dependencies configuration diff --git a/scripts/publish-apply.gradle b/scripts/publish-apply.gradle index 2ef057b..89f5c20 100644 --- a/scripts/publish-apply.gradle +++ b/scripts/publish-apply.gradle @@ -1,4 +1,17 @@ apply from: "$rootDir/scripts/versioning.gradle" +apply plugin: 'com.jfrog.bintray' +apply plugin: 'maven-publish' + +project.afterEvaluate { + publishing { + repositories { + maven { + def releasesRepoUrl = "https://dl.bintray.com/valueadd/android" + println("Repository url is $releasesRepoUrl") + } + } + } +} ext { publishedGroupId = 'pl.valueadd' @@ -29,12 +42,12 @@ bintray { key = properties.getProperty("bintray.apikey") pkg { - repo = islibraryVersionSnapshot ? 'snapshots' : 'maven' + repo = 'android' desc = libraryDescription websiteUrl = siteUrl vcsUrl = gitUrl licenses = allLicenses - dryRun = false + dryRun = islibraryVersionSnapshot /* DRY RUN */ publish = true override = true publicDownloadNumbers = true