Skip to content

Commit

Permalink
Merge pull request #1435 from epeee/gradle_4_9
Browse files Browse the repository at this point in the history
Update gradle (v4.9) and shipkit (v2.0.28)
  • Loading branch information
mockitoguy committed Jul 24, 2018
2 parents 107d515 + 6c99d93 commit 940e9ac
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
12 changes: 7 additions & 5 deletions build.gradle
Expand Up @@ -11,7 +11,7 @@ buildscript {
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.15'

//Using buildscript.classpath so that we can resolve shipkit from maven local, during local testing
classpath 'org.shipkit:shipkit:2.0.15'
classpath 'org.shipkit:shipkit:2.0.28'
}
}

Expand All @@ -21,6 +21,9 @@ plugins {

description = 'Mockito mock objects library core API and implementation'

apply plugin: 'base'
archivesBaseName = "mockito-core"

apply plugin: "org.shipkit.java"
allprojects {
plugins.withId("java") {
Expand All @@ -43,8 +46,6 @@ apply from: 'gradle/mockito-core/testing.gradle'

apply from: 'gradle/dependencies.gradle'

archivesBaseName = "mockito-core"

allprojects { proj ->
repositories {
jcenter()
Expand Down Expand Up @@ -87,8 +88,9 @@ dependencies {
testUtil sourceSets.test.output
}

task wrapper(type: Wrapper) {
gradleVersion = '4.7'
wrapper {
gradleVersion = '4.9'
distributionSha256Sum = 'e66e69dce8173dd2004b39ba93586a184628bc6c28461bc771d6835f7f9b0d28'
}

//Posting Build scans to https://scans.gradle.com
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
distributionSha256Sum=fca5087dc8b50c64655c000989635664a73b11b9bd3703c7d6cabd31b7dcdb04
distributionSha256Sum=e66e69dce8173dd2004b39ba93586a184628bc6c28461bc771d6835f7f9b0d28
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions settings.gradle
Expand Up @@ -16,3 +16,5 @@ rootProject.children.each { project ->
assert project.projectDir.isDirectory()
assert project.buildFile.isFile()
}

enableFeaturePreview('STABLE_PUBLISHING')

0 comments on commit 940e9ac

Please sign in to comment.