Add viaduct to the megazords

2019-03-22 19:40:31 -07:00 · 2019-03-22 19:40:31 -07:00 · bbc8615618
--- a/Cargo.lock
+++ b/Cargo.lock
@ -600,6 +600,7 @@ dependencies = [
 "places-ffi 0.1.0",
 "push-ffi 0.1.0",
 "rc_log_ffi 0.1.0",
+ "viaduct 0.1.0",
 ]

 [[package]]
@ -968,6 +969,7 @@ dependencies = [
 "fxaclient_ffi 0.1.0",
 "logins_ffi 0.1.0",
 "rc_log_ffi 0.1.0",
+ "viaduct 0.1.0",
 ]

 [[package]]
@ -1734,6 +1736,7 @@ dependencies = [
 "places-ffi 0.1.0",
 "push-ffi 0.1.0",
 "rc_log_ffi 0.1.0",
+ "viaduct 0.1.0",
 ]

 [[package]]
--- a/gradle-plugin/build.gradle
+++ b/gradle-plugin/build.gradle
@ -1,6 +1,6 @@
 buildscript {
    ext.kotlin_version = '1.3.10'
-    ext.plugin_version = '0.4.3'
+    ext.plugin_version = '0.4.4'

    repositories {
        google()
--- a/gradle-plugin/src/main/kotlin/mozilla/appservices/AppServicesExtension.kt
+++ b/gradle-plugin/src/main/kotlin/mozilla/appservices/AppServicesExtension.kt
@ -26,7 +26,8 @@ open class AppServicesExtension(project: Project) {
                setOf(
                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "fxaclient"),
                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "logins"),
-                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "rustlog")
+                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "rustlog"),
+                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "viaduct")
                )))
        megazords.add(MegazordDefinition("reference-browser",
                DefaultModuleIdentifier.newId("org.mozilla.appservices", "reference-browser-megazord"),
@ -35,7 +36,8 @@ open class AppServicesExtension(project: Project) {
                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "logins"),
                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "places"),
                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "push"),
-                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "rustlog")
+                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "rustlog"),
+                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "viaduct")
                )))
        megazords.add(MegazordDefinition("fenix",
                DefaultModuleIdentifier.newId("org.mozilla.appservices", "fenix-megazord"),
@ -43,7 +45,8 @@ open class AppServicesExtension(project: Project) {
                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "fxaclient"),
                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "places"),
                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "push"),
-                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "rustlog")
+                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "rustlog"),
+                        DefaultModuleIdentifier.newId("org.mozilla.appservices", "viaduct")
                )))
    }

--- a/megazords/fenix/Cargo.toml
+++ b/megazords/fenix/Cargo.toml
@ -12,3 +12,4 @@ fxaclient_ffi = { path = "../../components/fxa-client/ffi" }
 places-ffi = { path = "../../components/places/ffi" }
 push-ffi = { path = "../../components/push/ffi" }
 rc_log_ffi = { path = "../../components/rc_log" }
+viaduct = { path = "../../components/viaduct" }
--- a/megazords/fenix/android/build.gradle
+++ b/megazords/fenix/android/build.gradle
@ -86,6 +86,7 @@ dependencies {
    api project(path: ':places-library', configuration: 'withoutLib')
    api project(path: ':push-library', configuration: 'withoutLib')
    api project(path: ':rustlog-library', configuration: 'withoutLib')
+    api project(path: ':viaduct-library', configuration: 'withoutLib')

    jnaForTest 'net.java.dev.jna:jna:4.5.2@jar'
 }
--- a/megazords/fenix/android/src/main/java/mozilla/appservices/FenixMegazord.java
+++ b/megazords/fenix/android/src/main/java/mozilla/appservices/FenixMegazord.java
@ -10,5 +10,6 @@ public class FenixMegazord {
        System.setProperty("mozilla.appservices.places_ffi_lib_name", "fenix");
        System.setProperty("mozilla.appservices.push_ffi_lib_name", "fenix");
        System.setProperty("mozilla.appservices.rc_log_ffi_lib_name", "fenix");
+        System.setProperty("mozilla.appservices.viaduct_lib_name", "fenix");
    }
 }
--- a/megazords/fenix/src/lib.rs
+++ b/megazords/fenix/src/lib.rs
@ -8,3 +8,4 @@ pub extern crate fxaclient_ffi;
 pub extern crate places_ffi;
 pub extern crate push_ffi;
 pub extern crate rc_log_ffi;
+pub extern crate viaduct;
--- a/megazords/lockbox/Cargo.toml
+++ b/megazords/lockbox/Cargo.toml
@ -11,3 +11,4 @@ crate-type = ["cdylib"]
 fxaclient_ffi = { path = "../../components/fxa-client/ffi" }
 logins_ffi = { path = "../../components/logins/ffi" }
 rc_log_ffi = { path = "../../components/rc_log" }
+viaduct = { path = "../../components/viaduct" }
--- a/megazords/lockbox/android/build.gradle
+++ b/megazords/lockbox/android/build.gradle
@ -85,6 +85,7 @@ dependencies {
    api project(path: ':fxa-client-library', configuration: 'withoutLib')
    api project(path: ':logins-library', configuration: 'withoutLib')
    api project(path: ':rustlog-library', configuration: 'withoutLib')
+    api project(path: ':viaduct-library', configuration: 'withoutLib')

    jnaForTest 'net.java.dev.jna:jna:4.5.2@jar'
 }
--- a/megazords/lockbox/android/src/main/java/mozilla/appservices/LockboxMegazord.java
+++ b/megazords/lockbox/android/src/main/java/mozilla/appservices/LockboxMegazord.java
@ -9,5 +9,6 @@ public class LockboxMegazord {
        System.setProperty("mozilla.appservices.fxaclient_ffi_lib_name", "lockbox");
        System.setProperty("mozilla.appservices.logins_ffi_lib_name", "lockbox");
        System.setProperty("mozilla.appservices.rc_log_ffi_lib_name", "lockbox");
+        System.setProperty("mozilla.appservices.viaduct_lib_name", "lockbox");
    }
 }
--- a/megazords/lockbox/src/lib.rs
+++ b/megazords/lockbox/src/lib.rs
@ -7,3 +7,4 @@
 pub extern crate fxaclient_ffi;
 pub extern crate logins_ffi;
 pub extern crate rc_log_ffi;
+pub extern crate viaduct;
--- a/megazords/reference-browser/Cargo.toml
+++ b/megazords/reference-browser/Cargo.toml
@ -13,3 +13,4 @@ logins_ffi = { path = "../../components/logins/ffi" }
 places-ffi = { path = "../../components/places/ffi" }
 push-ffi = { path = "../../components/push/ffi" }
 rc_log_ffi = { path = "../../components/rc_log" }
+viaduct = { path = "../../components/viaduct" }
--- a/megazords/reference-browser/android/build.gradle
+++ b/megazords/reference-browser/android/build.gradle
@ -87,6 +87,7 @@ dependencies {
    api project(path: ':places-library', configuration: 'withoutLib')
    api project(path: ':push-library', configuration: 'withoutLib')
    api project(path: ':rustlog-library', configuration: 'withoutLib')
+    api project(path: ':viaduct-library', configuration: 'withoutLib')

    jnaForTest 'net.java.dev.jna:jna:4.5.2@jar'
 }
--- a/megazords/reference-browser/android/src/main/java/mozilla/appservices/ReferenceBrowserMegazord.java
+++ b/megazords/reference-browser/android/src/main/java/mozilla/appservices/ReferenceBrowserMegazord.java
@ -11,5 +11,6 @@ public class ReferenceBrowserMegazord {
        System.setProperty("mozilla.appservices.places_ffi_lib_name", "reference_browser");
        System.setProperty("mozilla.appservices.push_ffi_lib_name", "reference_browser");
        System.setProperty("mozilla.appservices.rc_log_ffi_lib_name", "reference_browser");
+        System.setProperty("mozilla.appservices.viaduct_lib_name", "reference_browser");
    }
 }
--- a/megazords/reference-browser/src/lib.rs
+++ b/megazords/reference-browser/src/lib.rs
@ -9,3 +9,4 @@ pub extern crate logins_ffi;
 pub extern crate places_ffi;
 pub extern crate push_ffi;
 pub extern crate rc_log_ffi;
+pub extern crate viaduct;