Skip to content

Commit

Permalink
update gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
mmoayyed committed Aug 6, 2022
1 parent 3c3a762 commit df1aa92
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 18 deletions.
14 changes: 14 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"extends": [
"config:base",
":preserveSemverRanges",
":rebaseStalePrs",
":disableRateLimiting",
":semanticCommits",
":semanticCommitTypeAll(renovatebot)"
],
"labels": [
"dependencies",
"bot"
]
}
38 changes: 38 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Build

env:
TERM: xterm-256color
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JDK_CURRENT: 11

##########################################################################

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

##########################################################################

jobs:
cancel-previous-runs:
runs-on: ubuntu-latest
timeout-minutes: 1
steps:
- uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
build:
runs-on: ubuntu-latest
# needs: [ build ]
if: ${{ github.event_name == 'push' }}
steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: ${{ env.JDK_CURRENT }}
- name: Build Project
run: ./gradlew clean build distZip distTar
33 changes: 18 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'distribution'
apply plugin: 'idea'
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'java-library'
apply plugin: 'maven-publish'

defaultTasks 'clean', 'distZip', 'distTar'

Expand All @@ -24,25 +24,28 @@ configurations {
provided
compile.extendsFrom provided
}
configurations.compile.transitive = false
configurations.implementation.transitive = false

dependencies {
compile "org.jasig.cas.client:cas-client-core:$project.casClientVersion"

provided "javax.servlet:javax.servlet-api:$project.servletVersion"
provided "net.shibboleth.idp:idp-authn-api:$project.shibIdpVersion"
provided "net.shibboleth.idp:idp-saml-api:$project.shibIdpVersion"
provided "org.apache.commons:commons-lang3:$project.commonLangVersion"

testCompile "junit:junit:$project.junitVersion"
testCompile "org.mockito:mockito-core:$project.mockitoVersion"
testCompile "org.powermock:powermock-api-mockito2:$project.powermockVersion"
testCompile "org.powermock:powermock-module-junit4:$project.powermockVersion"
implementation "org.jasig.cas.client:cas-client-core:$project.casClientVersion"

compileOnly "javax.servlet:javax.servlet-api:$project.servletVersion"
compileOnly "net.shibboleth.idp:idp-authn-api:$project.shibIdpVersion"
compileOnly "net.shibboleth.idp:idp-saml-api:$project.shibIdpVersion"
compileOnly "org.apache.commons:commons-lang3:$project.commonLangVersion"

testImplementation "junit:junit:$project.junitVersion"
testImplementation "net.shibboleth.idp:idp-authn-api:$project.shibIdpVersion"
testImplementation "net.shibboleth.idp:idp-saml-api:$project.shibIdpVersion"
testImplementation "javax.servlet:javax.servlet-api:$project.servletVersion"
testImplementation "org.mockito:mockito-core:$project.mockitoVersion"
testImplementation "org.powermock:powermock-api-mockito2:$project.powermockVersion"
testImplementation "org.powermock:powermock-module-junit4:$project.powermockVersion"
}

distributions {
main {
baseName = 'shib-cas-authn'
distributionBaseName = 'shib-cas-authn'
contents {
from { 'build/dist-tmp' }
}
Expand Down
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
gradleVersion=5.6.4

version=4.0.0

casClientVersion=3.6.0
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit df1aa92

Please sign in to comment.