Chore/code comments (#9)

* Cleaned up all modules

* Added inline code comments

* Improved tests

* Added native library loader

* Cleaned native build scripts

Author: slavaschmidt

.scalafmt.conf

@@ -10,7 +10,7 @@ continuationIndent.callSite = 2
 continuationIndent.defnSite = 2
 danglingParentheses = true
 indentOperator = spray
-maxColumn = 180
+maxColumn = 380
 project.git = true
 rewrite.rules = [RedundantParens, SortImports, PreferCurlyFors, SortModifiers]
 spaces.inImportCurlyBraces = false

build.sbt

@@ -1,18 +1,18 @@
-name := "sdk-scala-binding"
+name := "freeton-sdk-client-scala-binding"
 
-version := "0.1"
+version := "1.0.0-M2"
 
-scalaVersion := "2.12.12"
+organization := "com.dancingcode"
 
-lazy val circeVersion = "0.13.0"
+scalaVersion := "2.12.12"
 
 libraryDependencies ++= Seq(
   "org.slf4j"      % "slf4j-api"       % "1.7.30",
-  "ch.qos.logback" % "logback-classic" % "1.2.3" % Test, // TODO make provided
+  "ch.qos.logback" % "logback-classic" % "1.2.3" % Provided,
   "org.scalatest"  %% "scalatest"      % "3.2.2" % Test
 )
 
-libraryDependencies ++= Seq("circe-core", "circe-generic", "circe-parser", "circe-literal").map("io.circe" %% _ % circeVersion)
+libraryDependencies ++= Seq("circe-core", "circe-generic", "circe-parser", "circe-literal").map("io.circe" %% _ % "0.13.0")
 
 scalacOptions in Compile ++= Seq(
   "-Xlog-reflective-calls",
@@ -25,12 +25,23 @@ scalacOptions in Compile ++= Seq(
   "-Ywarn-numeric-widen",
   "-Ywarn-value-discard",
   "-Yrangepos"
-  // "-Xfatal-warnings"
 )
 
 fork in Test := true
 
+// settings for Sonatype
+homepage := Some(url("https://github.com/slavaschmidt/ton-sdk-client-scala-binding"))
+scmInfo := Some(ScmInfo(url("https://github.com/slavaschmidt/ton-sdk-client-scala-binding"), "[email protected]:slavaschmidt/ton-sdk-client-scala-binding.git"))
+developers := List(Developer("slasch", "Slava Schmidt", "[email protected]", url("https://github.com/slavaschmidt")))
+licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))
+publishMavenStyle := true
+
+// Add sonatype repository settings
+publishTo := Some(if (isSnapshot.value) Opts.resolver.sonatypeSnapshots else Opts.resolver.sonatypeStaging)
+
+credentials += Credentials(Path.userHome / ".sbt" / "sonatype_credentials")
+
 envVars in Test := Map(
-  "LD_LIBRARY_PATH" -> (baseDirectory.value / "lib").getPath,
-  "PATH" -> (baseDirectory.value / "lib").getPath
+  "LD_LIBRARY_PATH" -> (resourceDirectory in Compile).value.getAbsolutePath,
+  "PATH"            -> (resourceDirectory in Compile).value.getAbsolutePath
 )

project/plugins.sbt

@@ -1,2 +1,4 @@
-addSbtPlugin("org.scalameta"     % "sbt-scalafmt"           % "2.4.0")
-addSbtPlugin("org.scoverage"     % "sbt-scoverage"          % "1.6.0")
+addSbtPlugin("org.scalameta"  % "sbt-scalafmt"  % "2.4.0")
+addSbtPlugin("org.scoverage"  % "sbt-scoverage" % "1.6.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype"  % "2.3")
+addSbtPlugin("com.jsuereth"   % "sbt-pgp"       % "2.0.1")

src/main/c/build_jni_header.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -eE
+
+cd ../../..
+
+sbt compile
+
+CP=~/.ivy2/cache/org.scala-lang/scala-library/jars/scala-library-2.12.12.jar
+
+javah -cp $CP:target/scala-2.12/classes/ton.sdk.client.jni.Binding
+
+mv ton_sdk_client_jni_Binding.h src/main/c/
+
+cd -

src/main/c/build_linux.sh

@@ -2,27 +2,16 @@
 
 export JAVA_HOME=`dirname $(dirname $(readlink -f $(which javac)))`
 
-export LIBS="$(pwd)/lib"
-
-echo "$LIBS"
-echo "$JAVA_HOME"
-
-ls "$JAVA_HOME/include/linux"
-
-cd src/main/c
-
 gcc \
   -shared \
   -fPIC \
   -I"$JAVA_HOME/include/linux" \
   -I"$JAVA_HOME/include" \
   -L"$LIBS" \
   *.c \
-  -o "$LIBS/libTonSdkClientJniBinding.so" \
+  -o "libTonSdkClientJniBinding.so" \
   -lton_client
 
-  # -dynamiclib \
-cd -
 
 
 

src/main/c/build_mac_os_x.sh

@@ -2,12 +2,6 @@
 
 export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
 
-export LIBS="$(pwd)/lib"
-
-#sbt compile
-#CP=/Users/slasch/.ivy2/cache/org.scala-lang/scala-library/jars/scala-library-2.13.3.jar
-#javah -cp $CP:target/scala-2.13/classes/ ton.sdk.client.jni.Binding
-#mv ton_sdk_client_jni_Binding.h src/main/c/
 
 cd src/main/c
 

src/main/c/build_windows.sh

@@ -0,0 +1,15 @@
+@ECHO OFF
+
+# expects JAVA_HOME to be properly set on system level and point to JDK
+# for example JAVA_HOME="c:\work\jdk1.8.0_271"
+
+## don't forget to add long long definition to jni_md.h as in following:
+
+# # ifdef __GNUC__
+# typedef long long jlong;
+# #else
+# typedef _int64 jlong;
+# #endif
+
+cl *.c -I"!JAVA_HOME!\include\win32" -I"!JAVA_HOME!\include" -MD -LD -link "ton_client.dll.lib"
+