wbrawner/gradle-graal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into issue/239

Browse source
This commit is contained in:
Carter Kozak 2020-05-18 11:32:05 -04:00
commit ce438d99aa
4 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.baseline/checkstyle/checkstyle.xml
View file

@ -201,10 +201,6 @@
<property name="separated" value="true"/>
<property name="sortStaticImportsAlphabetically" value="true"/>
</module>
<module name="Indentation"> <!-- Java Style Guide: Block indentation: +4 spaces -->
<property name="arrayInitIndent" value="8"/>
<property name="lineWrappingIndentation" value="8"/>
</module>
<module name="InnerAssignment"/> <!-- Java Coding Guidelines: Inner assignments: Not used -->
<module name="LeftCurly"/> <!-- Java Style Guide: Nonempty blocks: K & R style -->
<module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->

23
build.gradle
View file

@ -18,18 +18,19 @@ buildscript {
repositories {
jcenter()
gradlePluginPortal()
maven { url "http://palantir.bintray.com/releases" }
maven { url 'https://palantir.bintray.com/releases'}
}
dependencies {
classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
classpath 'com.gradle.publish:plugin-publish-plugin:0.10.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
classpath 'com.palantir.baseline:gradle-baseline-java:2.41.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.13.1'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
classpath 'com.palantir.javaformat:gradle-palantir-java-format:1.0.0'
classpath 'com.netflix.nebula:gradle-info-plugin:7.1.4'
classpath 'com.gradle.publish:plugin-publish-plugin:0.11.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
classpath 'com.netflix.nebula:nebula-publishing-plugin:17.2.1'
classpath 'com.palantir.baseline:gradle-baseline-java:2.49.1'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.17.3'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0'
}
}
@ -37,7 +38,7 @@ buildscript {
repositories {
jcenter()
gradlePluginPortal()
maven { url "http://palantir.bintray.com/releases" }
maven { url 'https://palantir.bintray.com/releases'}
}
apply plugin: 'com.gradle.plugin-publish'
@ -51,6 +52,7 @@ apply plugin: 'java-gradle-plugin'
apply plugin: 'groovy'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'com.palantir.java-format'
apply from: "${rootDir}/gradle/bintray-publish.gradle"
group 'com.palantir.graal'
@ -63,7 +65,6 @@ dependencies {
testCompile gradleTestKit()
testCompile 'com.netflix.nebula:nebula-test'
testCompile 'com.squareup.okhttp3:mockwebserver'
}
gradlePlugin {

2
versions.lock
View file

@ -8,7 +8,7 @@ com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
com.google.guava:guava:27.0.1-jre (2 constraints: c7135868)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
com.google.j2objc:j2objc-annotations:1.1 (1 constraints: b609eba0)
com.netflix.nebula:nebula-test:7.6.0 (1 constraints: 0f052036)
com.netflix.nebula:nebula-test:7.8.6 (1 constraints: 17052c36)
com.squareup.okhttp3:mockwebserver:3.14.1 (1 constraints: 3b05423b)
com.squareup.okhttp3:okhttp:3.14.1 (1 constraints: 680fa37c)
com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)

2
versions.props
View file

@ -1,5 +1,5 @@
com.google.guava:guava = 27.0.1-jre
com.netflix.nebula:nebula-test = 7.6.0
com.netflix.nebula:nebula-test = 7.8.6
com.squareup.okhttp3:* = 3.14.1
# conflict resolution