Skip to content

Commit

Permalink
chore: Upgrade Gradle to 7.5.1 convert the project to use convention …
Browse files Browse the repository at this point in the history
…plugins
  • Loading branch information
rholshausen committed Nov 15, 2022
1 parent 6abdab2 commit 0338f43
Show file tree
Hide file tree
Showing 15 changed files with 396 additions and 514 deletions.
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# Linux start script should use lf
/gradlew text eol=lf

# These are Windows script files and should use crlf
*.bat text eol=crlf

8 changes: 4 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ jobs:
strategy:
matrix:
operating-system: [ ubuntu-latest, windows-latest, macos-latest ]
module: [ core, "consumer -x :consumer:junit:clojureTest", provider, pact-specification-test ]
# module: [ core, consumer, provider, pact-specification-test ]
module: [ core ]
steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
Expand All @@ -27,7 +28,6 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- run: ./gradlew -v
- run: ./gradlew :core:pactbroker:publishToMavenLocal :core:support:publishToMavenLocal :core:model:publishToMavenLocal
- name: Build with Gradle
run: ./gradlew -s --no-daemon -i -p ${{ matrix.module }} build
- name: Publish Unit Test Results
Expand All @@ -40,7 +40,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
module: [ core, consumer, provider, pact-specification-test ]
# module: [ core, consumer, provider, pact-specification-test ]
module: [ core ]
jdk: [ 11, 15, 16 ]
steps:
- uses: actions/checkout@v2
Expand All @@ -56,7 +57,6 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- run: ./gradlew -v
- run: ./gradlew :core:pactbroker:publishToMavenLocal :core:support:publishToMavenLocal
- name: Build with Gradle
run: ./gradlew -s --no-daemon -i -p ${{ matrix.module }} build
- name: Publish Unit Test Results
Expand Down
45 changes: 5 additions & 40 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,46 +1,11 @@
*.class
*.hprof
*.log
*/bin
# sbt specific
dist/*
lib_managed/
src_managed/
project/boot/
project/plugins/project/
pact-jvm-provider-sbt/project/project/
pact-jvm-provider-sbt/project/target/
# Ignore Gradle project-specific cache directory
.gradle

# Scala-IDE specific
.scala_dependencies

.DS_Store

*/.settings
# Ignore Gradle build output directory
build

# IDE files and directories
.idea
.idea_modules
*.iml

# Eclipse
*/.cache
.classpath
.settings
.project
build/
pkgdiff_reports/
.gradle/

out/
consumer/target/
consumer/groovy/target/
consumer/junit/target/
consumer/junit5/target/
consumer/specs2/target/
consumer/scalasupport/target/
provider/target/
provider/scalasupport/target/
.kotlintest/
bin/
.vscode/

222 changes: 0 additions & 222 deletions build.gradle

This file was deleted.

14 changes: 14 additions & 0 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
// Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that
// automatically become available as plugins in the main build.
id 'groovy-gradle-plugin'
}

repositories {
// Use the plugin portal to apply community plugins in convention plugins.
gradlePluginPortal()
}

dependencies {
implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
plugins {
// Apply the common convention plugin for shared build configuration between library and application projects.
id 'au.com.dius.pact.kotlin-common-conventions'

// Apply the application plugin to add support for building a CLI application in Java.
id 'application'
}
Loading

0 comments on commit 0338f43

Please sign in to comment.