react-native-zeroconf 0.13.4 → 0.13.7

package/README.md

@@ -11,6 +11,8 @@ Get running services advertizing themselves using Zeroconf implementations like
     react-native link
     # for ios (when using CocoaPods): 
     (cd ios && pod install)
+    # for macOS (when using CocoaPods):
+    (cd macos && pod install)
 
 You can look at [the wiki](https://github.com/Apercu/react-native-zeroconf/wiki) if you prefer a manual install.
 

package/android/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
   repositories {
       google()
-      jcenter()
+      mavenCentral()
   }
 
   dependencies {
@@ -37,13 +37,13 @@ android {
 
 repositories {
   google()
-  jcenter()
+  mavenCentral()
 }
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
     // https://mvnrepository.com/artifact/com.github.andriydruk/rx2dnssd
-    api group: 'com.github.andriydruk', name: 'rx2dnssd', version: '0.9.13'
+    api group: 'com.github.andriydruk', name: 'rx2dnssd', version: '0.9.16'
     // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
     api group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip

package/android/src/main/java/com/balthazargronon/RCTZeroconf/rx2dnssd/DnssdImpl.java

@@ -22,6 +22,7 @@ import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.List;
 
 import javax.annotation.Nullable;
 
@@ -84,20 +85,18 @@ public class DnssdImpl implements Zeroconf {
     private WritableMap serviceInfoToMap(BonjourService serviceInfo) {
         WritableMap service = new WritableNativeMap();
         service.putString(ZeroconfModule.KEY_SERVICE_NAME, serviceInfo.getServiceName());
-        final InetAddress host = serviceInfo.getInet4Address();
+        final List<InetAddress> hostList = serviceInfo.getInetAddresses();
         final String fullServiceName;
-        if (host == null) {
-            fullServiceName = serviceInfo.getServiceName();
-        } else {
-            Log.d("TAG", serviceInfo.getServiceName());
-            fullServiceName = serviceInfo.getServiceName();
-            service.putString(ZeroconfModule.KEY_SERVICE_HOST, fullServiceName);
-
-            WritableArray addresses = new WritableNativeArray();
-            addresses.pushString(host.getHostAddress());
+        Log.d("TAG", serviceInfo.getServiceName());
+        fullServiceName = serviceInfo.getServiceName();
+        service.putString(ZeroconfModule.KEY_SERVICE_HOST, fullServiceName);
 
-            service.putArray(ZeroconfModule.KEY_SERVICE_ADDRESSES, addresses);
+        WritableArray addresses = new WritableNativeArray();
+        for (InetAddress host : hostList) {
+            addresses.pushString(host.getHostAddress());
         }
+
+        service.putArray(ZeroconfModule.KEY_SERVICE_ADDRESSES, addresses);
         service.putString(ZeroconfModule.KEY_SERVICE_FULL_NAME, fullServiceName);
         service.putInt(ZeroconfModule.KEY_SERVICE_PORT, serviceInfo.getPort());
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-zeroconf",
-  "version": "0.13.4",
+  "version": "0.13.7",
   "description": "A Zeroconf discovery utility for react-native",
   "main": "dist",
   "scripts": {

package/react-native-zeroconf.podspec

@@ -11,6 +11,7 @@ Pod::Spec.new do |s|
   s.authors      = package['author']
   s.homepage     = package['homepage']
   s.ios.deployment_target = '9.0'
+  s.macos.deployment_target = '10.13'
   s.tvos.deployment_target = '9.0'
   
   s.source       = { :git => "https://github.com/balthazar/react-native-zeroconf.git", :tag => "v#{s.version}" }

package/android/.gitignore

@@ -1,47 +0,0 @@
-.svn
-.svn/*
-
-
-# Built application files
-*.apk
-*.ap_
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# Intellij
-*.iml
-.idea/workspace.xml
-.idea
-
-# Keystore files
-*.jks
-
-.externalNativeBuild