Move client cli to own package

Author: l-jonas

client-cli/build.gradle

@@ -0,0 +1,14 @@
+apply plugin: 'application'
+mainClassName = 'net.syncthing.java.client.cli.Main'
+
+dependencies {
+    compile project(':syncthing-java')
+    compile project(':repository')
+    compile "commons-cli:commons-cli:1.4"
+}
+
+run {
+    if (project.hasProperty('args')) {
+        args project.args.split('\\s+')
+    }
+}

client/src/main/kotlin/net/syncthing/java/client/Main.kt client-cli/src/main/kotlin/net/syncthing/java/client/cli/Main.kt

@@ -11,19 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.syncthing.java.client
+package net.syncthing.java.client.cli
 
-// this is archived
-//
-// I'm not sure if anyone still needs it. If someone needs it,
-// it should be moved to an other package because the SqlRepository
-// should not be a dependency of this module.
-
-/*
 import net.syncthing.java.core.beans.DeviceId
 import net.syncthing.java.core.beans.DeviceInfo
 import net.syncthing.java.core.beans.FileInfo
 import net.syncthing.java.core.configuration.Configuration
+import net.syncthing.java.repository.repo.SqlRepository
+import net.syncthing.java.client.SyncthingClient
 import org.apache.commons.cli.*
 import org.apache.commons.io.FileUtils
 import org.slf4j.LoggerFactory
@@ -48,7 +43,9 @@ class Main(private val commandLine: CommandLine) {
             val configuration = if (cmd.hasOption("C")) Configuration(File(cmd.getOptionValue("C")))
             else                                        Configuration()
 
-            SyncthingClient(configuration).use { syncthingClient ->
+            val repository = SqlRepository(configuration.databaseFolder)
+
+            SyncthingClient(configuration, repository, repository).use { syncthingClient ->
                 val main = Main(cmd)
                 cmd.options.forEach { main.handleOption(it, configuration, syncthingClient) }
             }
@@ -229,4 +226,3 @@ class Main(private val commandLine: CommandLine) {
         latch.await()
     }
 }
-*/

client/build.gradle

@@ -1,15 +1,5 @@
-apply plugin: 'application'
-mainClassName = 'net.syncthing.java.client.Main'
-
 dependencies {
     compile project(':core')
     compile project(':bep')
     compile project(':discovery')
-    compile "commons-cli:commons-cli:1.4"
-}
-
-run {
-    if (project.hasProperty('args')) {
-        args project.args.split('\\s+')
-    }
 }

settings.gradle

@@ -6,6 +6,7 @@ include ':bep'
 include ':client'
 include ':repository'
 include ':discovery'
+include ':client-cli'
 
 // Also call this syncthing-java so it can be easily used from syncthing-lite.
-project(':client').name = 'syncthing-java'
+project(':client').name = 'syncthing-java'