< prev index next >

buildSrc/ios.gradle

Print this page
rev 10149 : 8201553: Update FX build to use gradle 4.8
Reviewed-by:

@@ -519,16 +519,16 @@
             type: JavaCompile, group: "Build") {
 
             dependsOn(project(":graphics").classes, project(":base").classes)
             description = "Task compiles web component for iOS."
             classpath = files(
-                project(":controls").sourceSets.main.output.classesDir,
-                project(":graphics").sourceSets.main.output.classesDir,
-                project(":base").sourceSets.main.output.classesDir
+                project(":controls").sourceSets.main.java.outputDir,
+                project(":graphics").sourceSets.main.java.outputDir,
+                project(":base").sourceSets.main.java.outputDir
             )
             destinationDir = file("modules/web/build/classes/ios")
-            sourceSets.main.output.classesDir = destinationDir
+            sourceSets.main.java.outputDir = destinationDir
             dependencyCacheDir = file("modules/web/build/dependency-cache")
             source file("modules/web/src/ios/java")
             doLast {
                 copy {
                     from "modules/web/src/ios/resources"

@@ -547,13 +547,13 @@
             from("build/classes/ios")
         }
 
         addNative(project, "webview")
         javahIosWebview.dependsOn(compileWebJavaIos)
-        javahIosWebview.classpath += files(project(":base").sourceSets.main.output.classesDir,
-                             project(":graphics").sourceSets.main.output.classesDir,
-                             project(":controls").sourceSets.main.output.classesDir)
+        javahIosWebview.classpath += files(project(":base").sourceSets.main.java.outputDir,
+                             project(":graphics").sourceSets.main.java.outputDir,
+                             project(":controls").sourceSets.main.java.outputDir)
 
         jfxrtIos {
             from ("modules/web/build/classes/ios", "modules/web/build/resources/main");
             exclude("com/sun/webkit", "com/sun/javafx/webkit");
         }

@@ -650,12 +650,12 @@
     }
 
     afterEvaluate {
 
         addNative(project, "extensions")
-        javahIosExtensions.classpath += files(project(":base").sourceSets.main.output.classesDir,
-                             project(":graphics").sourceSets.main.output.classesDir)
+        javahIosExtensions.classpath += files(project(":base").sourceSets.main.java.outputDir,
+                             project(":graphics").sourceSets.main.java.outputDir)
 
         sdkIos  {
             doLast {
                 def props = project.ext["IOS"]
                 copy {
< prev index next >