Skip to content

Commit 2a02c00

Browse files
author
Arkadiusz Pałka
committed
build: change repository and gradle version
Update dependencies
1 parent 213f74c commit 2a02c00

File tree

6 files changed

+20
-26
lines changed

6 files changed

+20
-26
lines changed

.circleci/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ jobs:
2626
- run:
2727
name: Run Detekt
2828
command: ./gradlew detekt
29-
- run:
30-
name: Run FindBugs
31-
command: ./gradlew findbugs
3229
- run:
3330
name: Run Pmd
3431
command: ./gradlew pmd

build.gradle

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,11 @@ allprojects {
3030
}
3131
apply from: "$rootDir/scripts/detekt.gradle"
3232
apply from: "$rootDir/scripts/ktlint.gradle"
33-
apply from: "$rootDir/scripts/findbugs.gradle"
3433
apply from: "$rootDir/scripts/pmd.gradle"
3534
}
3635

3736
subprojects { Project project ->
3837
if (project.name.startsWith('mvi')) {
39-
apply plugin: 'com.jfrog.bintray'
40-
apply plugin: 'maven-publish'
4138

42-
project.afterEvaluate {
43-
publishing {
44-
repositories {
45-
maven {
46-
def releasesRepoUrl = "https://dl.bintray.com/valueadd-poland/maven"
47-
def snapshotsRepoUrl = "https://dl.bintray.com/valueadd-poland/snapshots"
48-
url = islibraryVersionSnapshot
49-
? snapshotsRepoUrl
50-
: releasesRepoUrl
51-
println("Repository url is $url")
52-
}
53-
}
54-
}
55-
}
5639
}
5740
}

dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ext.deps = deps
88
* Version variables.
99
*/
1010
def versions = [:]
11-
versions.android_gradle_plugin = "3.6.1"
11+
versions.android_gradle_plugin = "4.1.0"
1212
versions.androidx_appcompat = "1.0.2"
1313
versions.androidx_constraint = "1.1.3"
1414
versions.androidx_material = "1.0.0"
@@ -63,7 +63,7 @@ versions.fragmentation = "1.0.1"
6363
versions.material_progress_bar = "1.6.1"
6464
versions.fast_adapter = "4.0.1"
6565
versions.mockk = "1.9.3"
66-
versions.junit5_runner = "1.3.2.0"
66+
versions.junit5_runner = "1.6.2.0"
6767
versions.android_maven = "1.4.1"
6868
versions.bintray = "1.7.3"
6969
deps.versions = versions
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Feb 04 09:10:28 CET 2020
1+
#Tue Oct 20 08:42:56 CEST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

mvi-presenter/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ apply from: 'publish.gradle'
66
java {
77
sourceCompatibility = JavaVersion.VERSION_1_8
88
targetCompatibility = JavaVersion.VERSION_1_8
9+
withSourcesJar()
910
}
1011

1112
// Dependencies configuration

scripts/publish-apply.gradle

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
apply from: "$rootDir/scripts/versioning.gradle"
2+
apply plugin: 'com.jfrog.bintray'
3+
apply plugin: 'maven-publish'
4+
5+
project.afterEvaluate {
6+
publishing {
7+
repositories {
8+
maven {
9+
def releasesRepoUrl = "https://dl.bintray.com/valueadd/android"
10+
println("Repository url is $releasesRepoUrl")
11+
}
12+
}
13+
}
14+
}
215

316
ext {
417
publishedGroupId = 'pl.valueadd'
@@ -29,12 +42,12 @@ bintray {
2942
key = properties.getProperty("bintray.apikey")
3043

3144
pkg {
32-
repo = islibraryVersionSnapshot ? 'snapshots' : 'maven'
45+
repo = 'android'
3346
desc = libraryDescription
3447
websiteUrl = siteUrl
3548
vcsUrl = gitUrl
3649
licenses = allLicenses
37-
dryRun = false
50+
dryRun = islibraryVersionSnapshot /* DRY RUN */
3851
publish = true
3952
override = true
4053
publicDownloadNumbers = true

0 commit comments

Comments
 (0)