#1211 Merge branch 'dev_tsplugin'

devonfw · Aug 31, 2020 · 26dbba5 · 26dbba5
2 parents 85cc269 + e11f830
commit 26dbba5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/cobigen/cobigen-tsplugin/pom.xml b/cobigen/cobigen-tsplugin/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tsplugin</artifactId>
   <name>CobiGen - TypeScript Plug-in</name>
-  <version>2.4.3</version>
+  <version>2.4.4</version>
   <packaging>jar</packaging>
   <description>CobiGen - TypeScript Plug-in</description>
 
@@ -15,7 +15,7 @@
   <properties>
     <plugin.name>${project.artifactId}</plugin.name>
     <server.name>nestserver</server.name>
-    <server.version>1.1.5</server.version>
+    <server.version>1.1.7</server.version>
     <server.url>https\://registry.npmjs.org/@devonfw/cobigen-nestserver/-/cobigen-nestserver-${server.version}.tgz</server.url>
     <server.url.linux>https\://registry.npmjs.org/@devonfw/cobigen-nestserver-linux/-/cobigen-nestserver-linux-${server.version}.tgz</server.url.linux>
     <server.url.macos>https\://registry.npmjs.org/@devonfw/cobigen-nestserver-macos/-/cobigen-nestserver-macos-${server.version}.tgz</server.url.macos>
@@ -26,12 +26,12 @@
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core-api</artifactId>
-      <version>5.4.0</version>
+      <version>[6.1.2,)</version>
     </dependency>
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core</artifactId>
-      <version>[5.4.0,)</version>
+      <version>[6.1.2,)</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/...splugin/src/main/java/com/devonfw/cobigen/tsplugin/inputreader/TypeScriptInputReader.java b/...splugin/src/main/java/com/devonfw/cobigen/tsplugin/inputreader/TypeScriptInputReader.java
@@ -171,7 +171,6 @@ public Map<String, Object> createModel(Object input) {
         }
 
         return null;
-
     }
 
     @Override
@@ -283,7 +282,7 @@ public Object read(Path path, Charset inputCharset, Object... additionalArgument
     }
 
     @Override
-    public boolean isMostLikelyReadable(Path path) {
+    public Boolean isMostLikelyReadable(Path path) {
         return isValidInput(path);
     }
 

diff --git a/documentation/master-cobigen.asciidoc b/documentation/master-cobigen.asciidoc
@@ -20,7 +20,7 @@ DISCLAIMER: All Cobigen plugins are compatible with the latest release of Devonf
 * CobiGen v6.1.2
 * CobiGen - Java Plug-in v2.2.3
 * CobiGen - XML Plug-in v4.2.0
-* CobiGen - TypeScript Plug-in v2.4.3
+* CobiGen - TypeScript Plug-in v2.4.4
 * CobiGen - Property Plug-in v2.1.0
 * CobiGen - Text Merger v2.1.0
 * CobiGen - JSON Plug-in v2.1.0