Merge pull request #1240 from ultraon/patch-1

agrosner · web-flow · commit 5a5d2887ebef · 2017-04-11T21:13:34.000-04:00
Fixed issue: rx, rx2 (included koltinextensions) library jipack.io compilation
diff --git a/dbflow-rx-kotlinextensions/build.gradle b/dbflow-rx-kotlinextensions/build.gradle
@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+project.ext.artifactId = bt_name
+
 android {
     compileSdkVersion Integer.valueOf(dbflow_target_sdk)
     buildToolsVersion dbflow_build_tools_version
@@ -16,3 +18,5 @@ dependencies {
     compile project("${dbflow_project_prefix}dbflow-rx")
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
+
+apply from: '../kotlin-artifacts.gradle'
diff --git a/dbflow-rx-kotlinextensions/gradle.properties b/dbflow-rx-kotlinextensions/gradle.properties
@@ -0,0 +1,3 @@
+bt_name=dbflow-rx-kotlinextensions
+bt_packaging=aar
+bt_artifact_id=dbflow-rx-kotlinextensions
diff --git a/dbflow-rx/build.gradle b/dbflow-rx/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'com.android.library'
 
+project.ext.artifactId = bt_name
+
 android {
     compileSdkVersion Integer.valueOf(dbflow_target_sdk)
     buildToolsVersion dbflow_build_tools_version
@@ -19,3 +21,5 @@ dependencies {
     compile project("${dbflow_project_prefix}dbflow")
     compile 'io.reactivex:rxjava:1.2.7'
 }
+
+apply from: '../android-artifacts.gradle'
diff --git a/dbflow-rx/gradle.properties b/dbflow-rx/gradle.properties
@@ -0,0 +1,3 @@
+bt_name=dbflow-rx
+bt_packaging=aar
+bt_artifact_id=dbflow-rx
diff --git a/dbflow-rx2-kotlinextensions/build.gradle b/dbflow-rx2-kotlinextensions/build.gradle
@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+project.ext.artifactId = bt_name
+
 android {
     compileSdkVersion Integer.valueOf(dbflow_target_sdk)
     buildToolsVersion dbflow_build_tools_version
@@ -16,3 +18,5 @@ dependencies {
     compile project("${dbflow_project_prefix}dbflow-rx2")
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
+
+apply from: '../kotlin-artifacts.gradle'
diff --git a/dbflow-rx2-kotlinextensions/gradle.properties b/dbflow-rx2-kotlinextensions/gradle.properties
@@ -0,0 +1,3 @@
+bt_name=dbflow-rx2-kotlinextensions
+bt_packaging=aar
+bt_artifact_id=dbflow-rx2-kotlinextensions
diff --git a/dbflow-rx2/build.gradle b/dbflow-rx2/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'com.android.library'
 
+project.ext.artifactId = bt_name
+
 android {
     compileSdkVersion Integer.valueOf(dbflow_target_sdk)
     buildToolsVersion dbflow_build_tools_version
@@ -19,3 +21,5 @@ dependencies {
     compile project("${dbflow_project_prefix}dbflow")
     compile 'io.reactivex.rxjava2:rxjava:2.0.7'
 }
+
+apply from: '../android-artifacts.gradle'
diff --git a/dbflow-rx2/gradle.properties b/dbflow-rx2/gradle.properties
@@ -0,0 +1,3 @@
+bt_name=dbflow-rx2
+bt_packaging=aar
+bt_artifact_id=dbflow-rx2

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+bt_name=dbflow-rx-kotlinextensions`
	`2`	`+bt_packaging=aar`
	`3`	`+bt_artifact_id=dbflow-rx-kotlinextensions`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+bt_name=dbflow-rx`
	`2`	`+bt_packaging=aar`
	`3`	`+bt_artifact_id=dbflow-rx`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+bt_name=dbflow-rx2-kotlinextensions`
	`2`	`+bt_packaging=aar`
	`3`	`+bt_artifact_id=dbflow-rx2-kotlinextensions`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+bt_name=dbflow-rx2`
	`2`	`+bt_packaging=aar`
	`3`	`+bt_artifact_id=dbflow-rx2`