update binding-generator project to produce *.jar instead of *.aar

Author: Mihail Slavchev

.travis.yml

@@ -35,7 +35,7 @@ before_install:
   - export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
   - export PATH=${PATH}:${ANDROID_NDK_HOME}
 script:
-  - "./gradlew createPackage -i -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace"
+  - "./gradlew createPackage -i -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT -PembedBindingGenerator=true --stacktrace"
   - echo no | android create avd --force -n Arm21 -t android-21 -b armeabi-v7a -c 12M
   - emulator -avd Arm21 -no-skin -no-audio -no-window &
   - android-wait-for-emulator

binding-generator/build.gradle

@@ -1,22 +1,11 @@
-apply plugin: 'com.android.model.library'
-
-model {
-    android {
-        compileSdkVersion = 23
-        buildToolsVersion = "23.0.3"
-
-        defaultConfig.with {
-            minSdkVersion.apiLevel = 17
-            targetSdkVersion.apiLevel = 22
-        }
-        
-         lintOptions.with {
-            abortOnError = false
-        }
-
-    }
-}
+apply plugin: 'java'
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
+
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7
 }
+
+jar {
+}

binding-generator/src/main/java/com/tns/bindings/Dump.java

@@ -5,8 +5,6 @@
 import org.ow2.asmdex.*;
 import org.ow2.asmdex.structureCommon.*;
 
-import android.util.Log;
-
 import com.tns.bindings.desc.ClassDescriptor;
 import com.tns.bindings.desc.Descriptor;
 import com.tns.bindings.desc.MethodDescriptor;
@@ -609,7 +607,7 @@ private void generateHashCodeSuper(ClassVisitor cv)
 	private void generateMethod(ClassVisitor cv, ClassDescriptor classTo, MethodDescriptor method, int methodNumber, String classSignature, String tnsClassSignature, int fieldBit)
 	{
 		if (ProxyGenerator.IsLogEnabled) {
-			Log.d("Generator", "generatingMethod " + method.getName());
+			System.out.println("Generator: generatingMethod " + method.getName());
 		}
 
 		//TODO: handle checked exceptions

binding-generator/src/main/java/com/tns/bindings/ProxyGenerator.java

@@ -7,8 +7,6 @@
 
 import org.ow2.asmdex.ApplicationWriter;
 
-import android.util.Log;
-
 import com.tns.bindings.desc.ClassDescriptor;
 
 public class ProxyGenerator
@@ -70,7 +68,7 @@ public String generateProxy(String proxyName, ClassDescriptor classToProxy, Hash
 			proxyFileName += "-" + proxyThumb;
 		}
 
-		if (IsLogEnabled) Log.d("Generator", "Saving proxy with file name: " + proxyFileName);
+		if (IsLogEnabled) System.out.println("Generator: Saving proxy with file name: " + proxyFileName);
 		String proxyPath = saveProxy(proxyFileName, generatedBytes);
 
 		return proxyPath;

build-artifacts/project-template-gradle/build.gradle

@@ -197,7 +197,6 @@ dependencies {
         // builtBy 'copyAarDependencies'
     // }
 
-	compile project(':binding-generator')
 	compile project(':runtime')
 }
 

build-artifacts/project-template-gradle/settings.gradle

@@ -3,8 +3,4 @@ include "asbg"
 project(":asbg").projectDir = file("build-tools/android-static-binding-generator")
 
 include "runtime"
-project(":runtime").projectDir = file("build-tools/runtime-modules/runtime")
-
-
-include "binding-generator"
-project(":binding-generator").projectDir = file("build-tools/runtime-modules/binding-generator")
+project(":runtime").projectDir = file("build-tools/runtime-modules/runtime")

runtime/build.gradle

@@ -173,8 +173,14 @@ model {
     }
 }
 
-dependencies {
-    compile project(':binding-generator')
+if (project.hasProperty("embedBindingGenerator")) {
+    dependencies {
+        compile fileTree(dir: (project(':binding-generator').buildDir.toString() + "/libs"), include: ['*.jar'])
+    }
+} else {
+    dependencies {
+        compile project(':binding-generator')
+    }
 }
 
 task setPackageVersion {
@@ -225,4 +231,4 @@ task revertVersionFile(type: Exec) {
             commandLine "git", "checkout", "--", versionFilePath
         }
     }
-}
+}