comparison settings.gradle @ 11342:d7d63c79d24f

Merge
author kcr
date Tue, 10 Sep 2019 08:52:49 -0700
parents 1c9c3ac09110
children
comparison
equal deleted inserted replaced
27:f9567265ff6a 28:d7a5216a1cd1
1 /* 1 /*
2 * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. Oracle designates this 7 * published by the Free Software Foundation. Oracle designates this
33 project(":fxml").projectDir = file("modules/javafx.fxml") 33 project(":fxml").projectDir = file("modules/javafx.fxml")
34 project(":web").projectDir = file("modules/javafx.web") 34 project(":web").projectDir = file("modules/javafx.web")
35 project(":media").projectDir = file("modules/javafx.media") 35 project(":media").projectDir = file("modules/javafx.media")
36 project(":systemTests").projectDir = file("tests/system") 36 project(":systemTests").projectDir = file("tests/system")
37 37
38 // Stable publishing behavior is the default in gradle 5.x.
39 // This setting enables it in gradle 4.8 to help with the transition.
40 enableFeaturePreview('STABLE_PUBLISHING')
41
38 def closedDir = file("../rt-closed") 42 def closedDir = file("../rt-closed")
39 def buildClosed = closedDir.isDirectory() 43 def buildClosed = closedDir.isDirectory()
40 44
41 if (buildClosed) { 45 if (buildClosed) {
42 File supplementalSettingsFile = new File("../rt-closed/closed-settings.gradle"); 46 File supplementalSettingsFile = new File("../rt-closed/closed-settings.gradle");