Skip to content

Commit

Permalink
Upgrade to Gradle 5.0 (#900)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
SamCarlberg authored Jan 14, 2019
1 parent e0bf144 commit aabca35
Show file tree
Hide file tree
Showing 97 changed files with 1,695 additions and 3,415 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ hs_err_pid*
node_modules
bower_components

#Generated files should be ignored as the are regenerated as a build step
**/generated
# Generated files should be ignored as the are regenerated as a build step
*/generated_tests
/bin/
ui/PipelineTest.java
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ install:
script:
# Only run code generation tests on OSX -- linux requires sudo to install OpenCV dependencies, and that environment
# will not be able to run MainWindowTest.testDragOperationFromPaletteToPipeline
- ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests --scan;
- ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests;

after_success:
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then codecov ; fi
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
gradleOptions: '-Xmx3072m -Dorg.gradle.java.home=/usr/lib/jvm/java-8-oracle'
jdkUserInputPath: '/usr/lib/jvm/java-8-oracle'
publishJUnitResults: false
tasks: 'check jacocoTestReport jacocoRootReport jfxNative -Pheadless=true -PlogTests --stacktrace'
tasks: 'check jacocoTestReport jacocoRootReport jfxNative -Pgeneration -PjniLocation=build/OpenCVJNI -Pheadless=true -PlogTests --stacktrace'

# Publish JaCoCo code coverage results from the build
- task: PublishCodeCoverageResults@1
Expand Down
Loading

0 comments on commit aabca35

Please sign in to comment.