From 5129f6ecb2fe6cb68d0cd89c6fee2e08895bf0e4 Mon Sep 17 00:00:00 2001
From: Sergey Abramchuk <personal@ss-abramchuk.me>
Date: Thu, 5 Mar 2020 11:26:27 +0300
Subject: [PATCH] Fix missing public headers

---
 OpenVPNAdapter.podspec | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/OpenVPNAdapter.podspec b/OpenVPNAdapter.podspec
index 07699d2..472de64 100644
--- a/OpenVPNAdapter.podspec
+++ b/OpenVPNAdapter.podspec
@@ -46,63 +46,57 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.prefix_header_file = false
 
+  adapter_path = "Sources/OpenVPNAdapter"
+  asio_path = "Sources/ASIO"
+  lz4_path = "Sources/LZ4"
+  mbedtls_path = "Sources/mbedTLS"
+  openvpn_path = "Sources/OpenVPN3"
+  client_path = "Sources/OpenVPNClient"
+
   s.xcconfig = {
     "APPLICATION_EXTENSION_API_ONLY" => "YES",
     "CLANG_CXX_LANGUAGE_STANDARD" => "gnu++14",
     "CLANG_CXX_LIBRARY" => "libc++",
     "GCC_WARN_64_TO_32_BIT_CONVERSION" => "NO",
-    "CLANG_WARN_DOCUMENTATION_COMMENTS" => "NO"
+    "CLANG_WARN_DOCUMENTATION_COMMENTS" => "NO",
+    "HEADER_SEARCH_PATHS" => "\"${PODS_TARGET_SRCROOT}/#{asio_path}/asio/include/**\" \"${PODS_TARGET_SRCROOT}/#{mbedtls_path}/include/**\" \"${PODS_TARGET_SRCROOT}/#{openvpn_path}/**\""
   }
 
 
   # ――― Subspecs ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
 
   s.subspec "OpenVPNAdapter" do |adapter|
-    adapter_path = "Sources/OpenVPNAdapter"
-
-    adapter.source_files  = "#{adapter_path}/library/*.{h,m,mm}"
+    adapter.source_files  = "#{adapter_path}/library/*.{h,m,mm}", "#{adapter_path}/include/*.h"
     adapter.public_header_files = "#{adapter_path}/include/*.h"
 
     adapter.compiler_flags = "-DUSE_ASIO"
   end
 
   s.subspec "ASIO" do |asio|
-    asio_path = "Sources/ASIO"
-
-    asio.public_header_files = "#{asio_path}/asio/include/**/*.{hpp,ipp}"
     asio.preserve_paths = "#{asio_path}/asio/include/**/*.{hpp,ipp}"
   end
 
   s.subspec "LZ4" do |lz4|
-    lz4_path = "Sources/LZ4"
-
-    lz4.source_files  = "#{lz4_path}/lib/*.{h,c}"
-    lz4.public_header_files = "#{lz4_path}/include/*.h"
+    lz4.source_files  = "#{lz4_path}/lib/*.{h,c}",
+    lz4.private_header_files = "#{lz4_path}/lib/*.{h,c}"
 
     lz4.compiler_flags = "-DXXH_NAMESPACE=LZ4_"
   end
 
   s.subspec "mbedTLS" do |mbedtls|
-    mbedtls_path = "Sources/mbedTLS"
-
     mbedtls.source_files  = "#{mbedtls_path}/library/*.{c}"
-    mbedtls.public_header_files = "#{mbedtls_path}/include/*.h"
+    mbedtls.preserve_paths  = "#{mbedtls_path}/include/**/*.{h}"
 
     mbedtls.compiler_flags = "-DMBEDTLS_MD4_C", "-DMBEDTLS_RELAXED_X509_DATE", "-D_FILE_OFFSET_BITS=64"
   end
 
   s.subspec "OpenVPN3" do |openvpn|
-    openvpn_path = "Sources/OpenVPN3"
-
-    openvpn.public_header_files = "#{openvpn_path}/openvpn/**/*.hpp"
     openvpn.preserve_paths = "#{openvpn_path}/openvpn/**/*.hpp", "#{openvpn_path}/client/*.{hpp,cpp}"
   end
 
   s.subspec "OpenVPNClient" do |client|
-    client_path = "Sources/OpenVPNClient"
-
-    client.source_files  = "#{client_path}/library/*.{mm}"
-    client.public_header_files = "#{client_path}/include/*.h"
+    client.source_files = "#{client_path}/library/*.{mm}", "#{client_path}/include/*.{hpp}"
+    client.private_header_files = "#{client_path}/include/*.{hpp}"
 
     client.compiler_flags = "-DUSE_ASIO", "-DUSE_ASIO_THREADLOCAL", "-DASIO_STANDALONE", "-DASIO_NO_DEPRECATED", "-DASIO_HAS_STD_STRING_VIEW", "-DHAVE_LZ4", "-DUSE_MBEDTLS", "-DOPENVPN_FORCE_TUN_NULL", "-DUSE_TUN_BUILDER"
   end