eriwen · Oct 10, 2024 · Oct 10, 2024 · Oct 10, 2024 · Oct 10, 2024 · Oct 10, 2024
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ out/
 .idea/
 intellij
 gradle.properties
+/.DS_Store
diff --git a/README.md b/README.md
@@ -9,24 +9,10 @@ Wrangling your JS in a [Gradle](https://gradle.org) build is easy! Just add this
 ### Gradle 2.1+
 ```groovy
 plugins {
-  id "com.eriwen.gradle.js" version "2.14.1"
+  id "com.cloudzilla.gradle.js" version "2.16.2"
 }
 ```
 
-### Gradle 2.0-
-```groovy
-buildscript {
-  repositories {
-    jcenter()
-  }
-  dependencies {
-    classpath "com.eriwen:gradle-js-plugin:1.12.1"
-  }
-}
-
-apply plugin: "com.eriwen.gradle.js"
-```
-
 
 ```groovy
 // Declare your sources

diff --git a/build.gradle b/build.gradle
@@ -1,30 +1,23 @@
 plugins {
-    id 'com.gradle.build-scan' version '2.0.2'
-    id "com.gradle.plugin-publish" version "0.9.4"
-    id "com.jfrog.bintray" version "1.6"
+    id "com.gradle.plugin-publish" version "0.12.0"
+    id "java-gradle-plugin"
 }
+
 apply plugin: 'groovy'
-apply plugin: 'maven'
 apply plugin: 'maven-publish'
-apply plugin: 'signing'
 apply plugin: 'jacoco'
 apply plugin: 'project-report'
 
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
+sourceCompatibility = 11
+targetCompatibility = 11
 
 defaultTasks 'clean', 'build'
 
-version = '2.14.1'
-group = 'com.eriwen'
+version = '2.17.0'
+group = 'de.inetsoftware.gradle'
 ext.archivesBaseName = 'gradle-js-plugin'
 ext.isSnapshot = version.endsWith("-SNAPSHOT")
 
-buildScan {
-    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-    termsOfServiceAgree = 'yes'
-}
-
 repositories {
     jcenter()
 }
@@ -43,7 +36,7 @@ task createClasspathManifest {
 
 dependencies {
     compile gradleApi()
-    compile('com.google.javascript:closure-compiler:v20160208') {
+    compile('com.google.javascript:closure-compiler:v20240317') {
         exclude module: 'junit'
     }
     compile('io.jdev.html2js:html2js:0.1') {
@@ -98,41 +91,34 @@ publishing {
     }
 }
 
+gradlePlugin {
+    plugins {
+        jsPlugin {
+            id = 'com.cloudzilla.gradle.js'
+            implementationClass = 'com.eriwen.gradle.js.JsPlugin'
+        }
+    }
+}
+
+
 pluginBundle {
-    website = 'https://github.com/eriwen/gradle-js-plugin/'
-    vcsUrl = 'https://github.com/eriwen/gradle-js-plugin/'
+    website = 'https://github.com/mampcs/gradle-js-plugin/'
+    vcsUrl = 'https://github.com/mampcs/gradle-js-plugin/'
     description = 'Gradle plugin for working with JS'
     tags = ['javascript', 'jshint', 'requirejs']
 
     plugins {
         jsPlugin {
-            id = 'com.eriwen.gradle.js'
+            id = 'de.inetsoftware.gradle.js'
             displayName = 'Gradle JavaScript Plugin'
         }
     }
     mavenCoordinates {
-        groupId = 'com.eriwen'
+        groupId = 'de.inetsoftware.gradle'
         artifactId = 'gradle-js-plugin'
     }
 }
 
-signing {
-    sign configurations.archives
-}
-
-bintray {
-    user = System.properties['bintrayUsername']
-    key = System.properties['bintrayApiKey']
-    publications = ['maven']
-    pkg {
-        repo = 'gradle-plugins'
-        name = 'gradle-js-plugin'
-        desc = 'Gradle plugin for working with JS.'
-        licenses = ['Apache-2.0']
-        labels = ['gradle', 'js']
-    }
-}
-
 test {
     systemProperties['version'] = version
     testLogging {
@@ -142,68 +128,6 @@ test {
     }
 }
 
-jacoco {
-    toolVersion = "0.7.6.201602180812"
-    reportsDir = file("$buildDir/customJacocoReportDir")
-}
-
-jacocoTestReport {
-    reports {
-        xml.enabled false
-        csv.enabled false
-        html.destination file("${buildDir}/jacocoHtml")
-    }
-}
-
-jacocoTestCoverageVerification {
-    violationRules {
-        rule {
-            element = 'PACKAGE'
-            includes = ['com.eriwen.gradle.*']
-
-            limit {
-                counter = 'LINE'
-                value = 'COVEREDRATIO'
-                minimum = 0.6
-            }
-            limit {
-                counter = 'CLASS'
-                value = 'MISSEDCOUNT'
-                maximum = 0
-            }
-        }
-    }
-}
-
-// Only *require* signing if we are uploading a non snapshot version
-gradle.taskGraph.whenReady { taskGraph ->
-    tasks.withType(org.gradle.plugins.signing.Sign).all {
-        required = taskGraph.hasTask(":uploadArchives") && !isSnapshot
-    }
-}
-
-install.repositories.mavenInstaller {
-    pom.project(pomConfiguration)
-    if (signing.signatory) {
-        beforeDeployment { signing.signPom(it) }
-    }
-}
-
-uploadArchives {
-    repositories.mavenDeployer {
-        if (signing.signatory) {
-            beforeDeployment { signing.signPom(it) }
-        }
-        name = 'mavenCentralReleaseDeployer'
-        repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
-            authentication(userName: System.properties['mavenCentralUsername'], password: System.properties['mavenCentralPassword'])
-            releases(updatePolicy: 'always')
-            snapshots(updatePolicy: 'always')
-        }
-        pom.project(pomConfiguration)
-    }
-}
-
 /**
  * Create POM config and return for use by other tasks.
  */
@@ -212,7 +136,7 @@ def getPomConfiguration() {
         name 'Gradle JS Plugin'
         packaging 'jar'
         description 'A Gradle plugin for working with JS.'
-        url 'https://github.com/eriwen/gradle-js-plugin'
+        url 'https://github.com/i-net-software/gradle-js-plugin'
         licenses {
             license {
                 name 'The Apache Software License, Version 2.0'
@@ -226,11 +150,16 @@ def getPomConfiguration() {
                 name 'Eric Wendelin'
                 email 'me@eriwen.com'
             }
+            developer {
+                id 'inetsoftware'
+                name 'i-net software GmbH'
+                email 'contact@inetsoftware.de'
+            }
         }
         scm {
-            connection 'scm:https://eriwen@github.com/eriwen/gradle-js-plugin'
-            developerConnection 'scm:git@github.com:eriwen/gradle-js-plugin.git'
-            url 'https://github.com/eriwen/gradle-js-plugin'
+            connection 'scm:https://gamma@github.com/i-net-software/gradle-js-plugin'
+            developerConnection 'scm:git@github.com/i-net-software/gradle-js-plugin.git'
+            url 'http://github.com/i-net-software/gradle-js-plugin'
         }
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
diff --git a/issue12.gradle b/issue12.gradle
@@ -13,7 +13,7 @@ configurations {
 }
 
 dependencies {
-    rhino 'org.mozilla:rhino:1.7R3'
+    rhino 'org.mozilla:rhino:1.7.15'
 }
 
 apply plugin: 'js'

diff --git a/src/main/groovy/com/eriwen/gradle/js/JsMinifier.groovy b/src/main/groovy/com/eriwen/gradle/js/JsMinifier.groovy
@@ -25,13 +25,13 @@ class JsMinifier {
         CompilationLevel.valueOf(compilationLevel).setOptionsForCompilationLevel(options)
         WarningLevel level = WarningLevel.valueOf(warningLevel)
         level.setOptionsForWarningLevel(options)
-        List<SourceFile> externs = CommandLineRunner.getBuiltinExterns(new CompilerOptions());
+        List<SourceFile> externs = CommandLineRunner.getBuiltinExterns(options.environment);
         if (externsFiles.size()) {
-            externs.addAll(externsFiles.collect() { SourceFile.fromFile(it) })
+            externs.addAll(externsFiles.collect() { SourceFile.fromFile(it.absolutePath) })
         }
         List<SourceFile> inputs = new ArrayList<SourceFile>()
         inputFiles.each { inputFile -> 
-          inputs.add(SourceFile.fromFile(inputFile))
+          inputs.add(SourceFile.fromFile(inputFile.absolutePath))
         }
         Result result = compiler.compile(externs, inputs, options)
         if (result.success) {

diff --git a/src/main/groovy/com/eriwen/gradle/js/JsPlugin.groovy b/src/main/groovy/com/eriwen/gradle/js/JsPlugin.groovy
@@ -67,7 +67,7 @@ class JsPlugin implements Plugin<Project> {
             rhino
         }
         project.dependencies {
-            rhino 'org.mozilla:rhino:1.7R3'
+            rhino 'org.mozilla:rhino:1.7.15'
         }
         // TODO: have 'check' depend on jshint
     }

diff --git a/src/main/groovy/com/eriwen/gradle/js/tasks/JsDocTask.groovy b/src/main/groovy/com/eriwen/gradle/js/tasks/JsDocTask.groovy
@@ -17,6 +17,7 @@ package com.eriwen.gradle.js.tasks
 
 import com.eriwen.gradle.js.ResourceUtil
 import com.eriwen.gradle.js.RhinoExec
+import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
@@ -28,8 +29,8 @@ class JsDocTask extends SourceTask {
     private static final ResourceUtil RESOURCE_UTIL = new ResourceUtil()
     private final RhinoExec rhino = new RhinoExec(project)
 
-    Iterable<String> modulePaths = ['lib', 'node_modules', 'rhino', '.']
-    Boolean debug = false
+    @Input Iterable<String> modulePaths = ['lib', 'node_modules', 'rhino', '.']
+    @Input Boolean debug = false
 
     @OutputDirectory def destinationDir
 

diff --git a/src/main/groovy/com/eriwen/gradle/js/tasks/JsHintTask.groovy b/src/main/groovy/com/eriwen/gradle/js/tasks/JsHintTask.groovy
@@ -23,7 +23,7 @@ import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.OutputFile
 
 class JsHintTask extends SourceTask {
-    private static final String JSHINT_PATH = 'jshint-rhino-2.4.3.js'
+    private static final String JSHINT_PATH = 'jshint-rhino-2.13.6.js'
     private static final String TMP_DIR = "tmp${File.separator}js"
     private static final ResourceUtil RESOURCE_UTIL = new ResourceUtil()
     private final RhinoExec rhino = new RhinoExec(project)