Skip to content

Commit

Permalink
build: change repository and gradle version
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
Arkadiusz Pałka committed Oct 20, 2020
1 parent 213f74c commit 2a02c00
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 26 deletions.
3 changes: 0 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 0 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}
}
}
}
4 changes: 2 additions & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions mvi-presenter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ apply from: 'publish.gradle'
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
withSourcesJar()
}

// Dependencies configuration
Expand Down
17 changes: 15 additions & 2 deletions scripts/publish-apply.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2a02c00

Please sign in to comment.