changeset 557:07bc0bf4b21a

fix build.gradle
author riono
date Thu, 30 Jan 2020 17:26:01 +0900
parents 8f84d261449e
children 8e507ce09187
files build.gradle
diffstat 1 files changed, 28 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Thu Jan 30 16:23:50 2020 +0900
+++ b/build.gradle	Thu Jan 30 17:26:01 2020 +0900
@@ -1,5 +1,4 @@
 plugins {
-    //id "edu.sc.seis.macAppBundle" version "2.1.7"
     id "edu.sc.seis.macAppBundle" version "2.3.0"
 }
 
@@ -16,13 +15,12 @@
 project.ext.baseName = 'tightvnc-jviewer'
 def buildNo = processBuildNo(version)
 
-defaultTasks 'clean', 'dist'
+defaultTasks 'clean' , 'jar'
 macAppBundle {
     mainClassName = "com.glavsoft.viewer.TreeViewer"
     icon = "src/viewer_swing/resources/TreeVNC.png.icns"
     bundleJRE = true
     javaProperties.put("apple.laf.useScreenMenuBar", "true")
-    //backgroundImage = "doc/macbackground.png"
 }
 
 //convasion jar file for .app
@@ -30,8 +28,8 @@
 //icon create web applecation
 //https://iconverticons.com/online/ 
 configurations {
-    viewerSwingCompile { extendsFrom compile }
-    viewerSwingRuntime { extendsFrom viewerSwingCompile, runtime }
+    viewerSwingImplementation { extendsFrom implementation }
+    //viewerSwingRuntime { extendsFrom viewerSwingCompile, runtime }
 }
 
 sourceSets {
@@ -56,9 +54,9 @@
 }
 
 dependencies {
-    viewerSwingCompile group: 'com.jcraft', name: 'jsch', version: '0.1.+', ext: 'jar'
-    compile group: 'com.jcraft', name: 'jsch', version: '0.1.+', ext: 'jar'
-    viewerSwingRuntime configurations.viewerSwingCompile
+    viewerSwingImplementation group: 'com.jcraft', name: 'jsch', version: '0.1.+', ext: 'jar'
+    implementation group: 'com.jcraft', name: 'jsch', version: '0.1.+', ext: 'jar'
+    //viewerSwingRuntime configurations.viewerSwingCompile
 }
 
 def manifestAttributes = ['Main-Class': 'com.glavsoft.viewer.TreeViewer',
@@ -67,44 +65,44 @@
         'Implementation-Vendor': 'GlavSoft LLC.']
 
 jar {
-    baseName = project.baseName
-    version = null
+    //baseName = project.baseName
+    //version = null
     manifest {
         attributes manifestAttributes
     }
-    def runtimeDeps = configurations.viewerSwingRuntime.collect {
-        it.isDirectory() ? it : zipTree(it)
-    }
-    from(runtimeDeps) {
-        exclude 'META-INF/**'
-    }
+//    def runtimeDeps = configurations.viewerSwingRuntime.collect {
+//        it.isDirectory() ? it : zipTree(it)
+//    }
+//    from(runtimeDeps) {
+//        exclude 'META-INF/**'
+//    }
 }
 
 
 
 
 task noSshJar (type: Jar, dependsOn: classes) {
-    baseName = 'nossh/' + project.baseName
-    version = null
+//    baseName = 'nossh/' + project.baseName
+//    version = null
     manifest {
         attributes manifestAttributes
     }
     from sourceSets.main.output
 }
 
-artifacts {
-    archives file('src/web/viewer-applet-example.html')
-    archives noSshJar
-}
+//artifacts {
+//    archives file('src/web/viewer-applet-example.html')
+//    archives noSshJar
+//}
 
-uploadArchives {
-    repositories {
-        
-    }
-	uploadDescriptor = false
-}
+//uploadArchives {
+//    repositories {
+//
+//    }
+//	uploadDescriptor = false
+//}
 
-task dist(dependsOn: uploadArchives)
+//task dist(dependsOn: uploadArchives)
 
 def processBuildNo(currentVersion) {
     final String VERSION = 'version'
@@ -158,4 +156,4 @@
 //            options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
 //        }
 //    }
-//}
\ No newline at end of file
+//}