Skip to content

Commit aabca35

Browse files
authored
Upgrade to Gradle 5.0 (#900)
* Move to Gradle 5.0 Remove buildSrc project Move generated code into core Give each project its own buildscript * Use kotlin DSL where possible * Add spotbugs Fix new a problem identified by spotbugs * Do not run build scans on Travis * Remove evaulationDependsOn * Cleaner codegen tests exclusion * Run OpenCV installation in its own task and allow relative JNI paths * Run code generation tests on Azure Linux
1 parent e0bf144 commit aabca35

File tree

97 files changed

+1695
-3415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1695
-3415
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ hs_err_pid*
8484
node_modules
8585
bower_components
8686

87-
#Generated files should be ignored as the are regenerated as a build step
88-
**/generated
87+
# Generated files should be ignored as the are regenerated as a build step
8988
*/generated_tests
9089
/bin/
9190
ui/PipelineTest.java

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ install:
3636
script:
3737
# Only run code generation tests on OSX -- linux requires sudo to install OpenCV dependencies, and that environment
3838
# will not be able to run MainWindowTest.testDragOperationFromPaletteToPipeline
39-
- ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests --scan;
39+
- ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests;
4040

4141
after_success:
4242
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then codecov ; fi

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
gradleOptions: '-Xmx3072m -Dorg.gradle.java.home=/usr/lib/jvm/java-8-oracle'
3030
jdkUserInputPath: '/usr/lib/jvm/java-8-oracle'
3131
publishJUnitResults: false
32-
tasks: 'check jacocoTestReport jacocoRootReport jfxNative -Pheadless=true -PlogTests --stacktrace'
32+
tasks: 'check jacocoTestReport jacocoRootReport jfxNative -Pgeneration -PjniLocation=build/OpenCVJNI -Pheadless=true -PlogTests --stacktrace'
3333

3434
# Publish JaCoCo code coverage results from the build
3535
- task: PublishCodeCoverageResults@1

0 commit comments

Comments
 (0)