Skip to content

Commit

Permalink
Merge pull request #5 from moqui/gradle-7-support
Browse files Browse the repository at this point in the history
Updates for Gradle 7 support
  • Loading branch information
jonesde authored May 3, 2022
2 parents 1ec0028 + c690e33 commit ad5f555
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ def frameworkDir = file(moquiDir.absolutePath + '/framework')
// to run use "gradle dependencyUpdates"
apply plugin: 'com.github.ben-manes.versions'
buildscript {
repositories {
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies { classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' }
repositories {
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies { classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' }
}
repositories {
flatDir name: 'localLib', dirs: frameworkDir.absolutePath + '/lib'
Expand All @@ -40,15 +40,16 @@ tasks.withType(JavaCompile) { options.compilerArgs << "-proc:none" }
tasks.withType(GroovyCompile) { options.compilerArgs << "-proc:none" }

dependencies {
compile project(':framework')
implementation project(':framework')

// AWS Java SDK for supported services (depends on core and kms jars)
compile group: 'software.amazon.awssdk', name: 's3', version: '2.17.4' // Apache 2.0
compile group: 'software.amazon.awssdk', name: 'sns', version: '2.17.4' // Apache 2.0
implementation group: 'software.amazon.awssdk', name: 's3', version: '2.17.4' // Apache 2.0
implementation group: 'software.amazon.awssdk', name: 'sns', version: '2.17.4' // Apache 2.0

// explicit dependencies to get newer versions
compile 'io.netty:netty-codec-http:4.1.66.Final'
compile 'io.netty:netty-codec-http2:4.1.66.Final'
compile 'io.netty:netty-transport-native-epoll:4.1.66.Final'
implementation 'io.netty:netty-codec-http:4.1.66.Final'
implementation 'io.netty:netty-codec-http2:4.1.66.Final'
implementation 'io.netty:netty-transport-native-epoll:4.1.66.Final'
}

// by default the Java plugin runs test on build, change to not do that (only run test if explicit task)
Expand All @@ -63,7 +64,7 @@ jar {
baseName = jarBaseName
}
task copyDependencies { doLast {
copy { from (configurations.runtime - project(':framework').configurations.runtime - project(':framework').jar.archivePath)
copy { from (configurations.runtimeClasspath - project(':framework').configurations.runtimeClasspath - project(':framework').jar.archivePath)
into file(projectDir.absolutePath + '/lib') }
} }
copyDependencies.dependsOn cleanLib
Expand Down

0 comments on commit ad5f555

Please sign in to comment.