Blob Blame History Raw
--- rt-8u202-b02/build.gradle
+++ rt-8u202-b02-patched/build.gradle
@@ -1303,7 +1303,7 @@
 
     dependencies {
         compile project(":base"), BUILD_SRC
-        compile name: SWT_FILE_NAME
+        compile group: "org.eclipse.swt", name: "swt", version: "3.108.0"
         stubCompile group: "junit", name: "junit", version: "4.8.2",
         project(":base").sourceSets.test.output, sourceSets.main.output
         antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
@@ -1688,7 +1688,7 @@
     }
     dependencies {
         compile BUILD_SRC, project(":base"), project(":graphics")
-        compile name: SWT_FILE_NAME
+        compile group: "org.eclipse.swt", name: "swt", version: "3.108.0"
     }
 }
 
@@ -3268,38 +3268,38 @@
     // The apps build is Ant based, and gradle lets us "import" ant build.xml
     // into our configuration.
 
-    ant.importBuild 'build.xml'
+    //ant.importBuild 'build.xml'
 
     // Download the Lucene libraries needed for the Ensemble8 app
-    def luceneVersion = "7.4.0"
-    getConfigurations().create("lucene");
-    dependencies {
-        lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion
-        lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion
-        lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion
-    }
+    //def luceneVersion = "7.4.0"
+    //getConfigurations().create("lucene");
+    //dependencies {
+    //    lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion
+    //    lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion
+    //    lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion
+    //}
 
     // Copy Lucene libraries into the Ensemble8/lib directory
-    File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib");
-    def libNames = [ "lucene-core-${luceneVersion}.jar",
-                     "lucene-grouping-${luceneVersion}.jar",
-                     "lucene-queryparser-${luceneVersion}.jar" ]
-
-
-    task getLucene(type: Copy) {
-        doFirst {
-            ensembleLibDir.mkdirs();
-        }
-        into ensembleLibDir
-        includeEmptyDirs = false
-        configurations.lucene.files.each { f ->
-            libNames.each { name ->
-                if (name == f.getName()) {
-                    from f.getPath()
-                }
-            }
-        }
-    }
+    //File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib");
+    //def libNames = [ "lucene-core-${luceneVersion}.jar",
+    //                 "lucene-grouping-${luceneVersion}.jar",
+    //                 "lucene-queryparser-${luceneVersion}.jar" ]
+
+
+    //task getLucene(type: Copy) {
+    //    doFirst {
+    //        ensembleLibDir.mkdirs();
+    //    }
+    //    into ensembleLibDir
+    //    includeEmptyDirs = false
+    //    configurations.lucene.files.each { f ->
+    //        libNames.each { name ->
+    //            if (name == f.getName()) {
+    //                from f.getPath()
+    //            }
+    //        }
+    //    }
+    //}
 
     compileTargets { t ->
         // The apps build is Ant based, and gradle lets us "import" ant apps/build.xml
@@ -3310,7 +3310,7 @@
         def jfxrtJar = "${rootProject.buildDir}/${sdkDirName}/rt/lib/ext/jfxrt.jar"
 
         def appsJar = project.task("appsJar${t.capital}") {
-            dependsOn(sdk, getLucene)
+            dependsOn(sdk)
             doLast() {
               ant.properties['targetBld'] = "$t.name"
               if (!rootProject.ext[t.upper].compileSwing) {