diff --git a/CHANGELOG.md b/CHANGELOG.md index 571c3f5245b6e67043d429481ef8d53432e6cacb..4513e8ed41dcda0c07ba83ff5dc6e3b4080971a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # IPtProxy Changelog +## 1.4.0 +- Updated Obfs4proxy to latest 0.0.13-dev which fixes a bug which made prior + versions distinguishable. +- Fixed minor documentation issues. + ## 1.3.0 - Updated Snowflake to version 2.0.1. - Added Snowflake AMP support. diff --git a/IPtProxy-sources.jar b/IPtProxy-sources.jar index e43cd9850bd5439c4193a9eeaf6730ef04ffa205..fcbad6de6016e254f4a5af1ac44deb343cd0d1eb 100644 Binary files a/IPtProxy-sources.jar and b/IPtProxy-sources.jar differ diff --git a/IPtProxy.aar b/IPtProxy.aar index 16d075a0f3694b519f8e6c7ad1cca6d20096b00c..3f437fd572e421339741dfb6111769cd32b6f7f0 100644 Binary files a/IPtProxy.aar and b/IPtProxy.aar differ diff --git a/IPtProxy.podspec b/IPtProxy.podspec index 024b070bf72a8dcf75ad604b7f112bc9daa656ef..dcb7283e9e8c9e59a6d10de3b6ed47d635de7e68 100644 --- a/IPtProxy.podspec +++ b/IPtProxy.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'IPtProxy' - s.version = '1.3.0' + s.version = '1.4.0' s.summary = 'Obfs4proxy and Snowflake Pluggable Transports for iOS' s.description = <<-DESC diff --git a/IPtProxy.xcframework/Info.plist b/IPtProxy.xcframework/Info.plist index 45f8f8c593f06f907d6785906b8b03faeebe7224..f559237aeef2bdc7a474047e0ad5306f91ae084e 100644 --- a/IPtProxy.xcframework/Info.plist +++ b/IPtProxy.xcframework/Info.plist @@ -6,30 +6,30 @@ <array> <dict> <key>LibraryIdentifier</key> - <string>ios-arm64_x86_64-simulator</string> + <string>ios-arm64</string> <key>LibraryPath</key> <string>IPtProxy.framework</string> <key>SupportedArchitectures</key> <array> <string>arm64</string> - <string>x86_64</string> </array> <key>SupportedPlatform</key> <string>ios</string> - <key>SupportedPlatformVariant</key> - <string>simulator</string> </dict> <dict> <key>LibraryIdentifier</key> - <string>ios-arm64</string> + <string>ios-arm64_x86_64-simulator</string> <key>LibraryPath</key> <string>IPtProxy.framework</string> <key>SupportedArchitectures</key> <array> <string>arm64</string> + <string>x86_64</string> </array> <key>SupportedPlatform</key> <string>ios</string> + <key>SupportedPlatformVariant</key> + <string>simulator</string> </dict> </array> <key>CFBundlePackageType</key> diff --git a/IPtProxy.xcframework/ios-arm64/IPtProxy.framework/Versions/A/Headers/IPtProxy.objc.h b/IPtProxy.xcframework/ios-arm64/IPtProxy.framework/Versions/A/Headers/IPtProxy.objc.h index 3b828ba6cd18a9074d0ab65d29ce40118144eb90..7cebb9b64cded6bffd4a61d0b48d3e0f45685f93 100644 --- a/IPtProxy.xcframework/ios-arm64/IPtProxy.framework/Versions/A/Headers/IPtProxy.objc.h +++ b/IPtProxy.xcframework/ios-arm64/IPtProxy.framework/Versions/A/Headers/IPtProxy.objc.h @@ -91,9 +91,10 @@ FOUNDATION_EXPORT long IPtProxyStartObfs4Proxy(NSString* _Nullable logLevel, BOO @param front Front domain. -@param ampCache URL of AMP cache to use as a proxy for signaling +@param ampCache OPTIONAL. URL of AMP cache to use as a proxy for signaling. + Only needed when you want to do the rendezvous over AMP instead of a domain fronted server. -@param logFile Name of log file. OPTIONAL +@param logFile Name of log file. OPTIONAL. Defaults to no log. @param logToStateDir Resolve the log file relative to Tor's PT state dir. @@ -118,7 +119,7 @@ FOUNDATION_EXPORT long IPtProxyStartSnowflake(NSString* _Nullable ice, NSString* @param stun STUN URL. OPTIONAL. Defaults to stun:stun.stunprotocol.org:3478, if empty. -@param natProbe. OPTIONAL. Defaults to https://snowflake-broker.torproject.net:8443/probe, if empty. +@param natProbe OPTIONAL. Defaults to https://snowflake-broker.torproject.net:8443/probe, if empty. @param logFile Name of log file. OPTIONAL. Defaults to STDERR. diff --git a/IPtProxy.xcframework/ios-arm64/IPtProxy.framework/Versions/A/IPtProxy b/IPtProxy.xcframework/ios-arm64/IPtProxy.framework/Versions/A/IPtProxy index 7ee1040371934b557be1b4e6cf012974ccf87a28..31af4b8efbe42b1cda8c96ed2f8b729546189794 100644 Binary files a/IPtProxy.xcframework/ios-arm64/IPtProxy.framework/Versions/A/IPtProxy and b/IPtProxy.xcframework/ios-arm64/IPtProxy.framework/Versions/A/IPtProxy differ diff --git a/IPtProxy.xcframework/ios-arm64_x86_64-simulator/IPtProxy.framework/Versions/A/Headers/IPtProxy.objc.h b/IPtProxy.xcframework/ios-arm64_x86_64-simulator/IPtProxy.framework/Versions/A/Headers/IPtProxy.objc.h index 3b828ba6cd18a9074d0ab65d29ce40118144eb90..7cebb9b64cded6bffd4a61d0b48d3e0f45685f93 100644 --- a/IPtProxy.xcframework/ios-arm64_x86_64-simulator/IPtProxy.framework/Versions/A/Headers/IPtProxy.objc.h +++ b/IPtProxy.xcframework/ios-arm64_x86_64-simulator/IPtProxy.framework/Versions/A/Headers/IPtProxy.objc.h @@ -91,9 +91,10 @@ FOUNDATION_EXPORT long IPtProxyStartObfs4Proxy(NSString* _Nullable logLevel, BOO @param front Front domain. -@param ampCache URL of AMP cache to use as a proxy for signaling +@param ampCache OPTIONAL. URL of AMP cache to use as a proxy for signaling. + Only needed when you want to do the rendezvous over AMP instead of a domain fronted server. -@param logFile Name of log file. OPTIONAL +@param logFile Name of log file. OPTIONAL. Defaults to no log. @param logToStateDir Resolve the log file relative to Tor's PT state dir. @@ -118,7 +119,7 @@ FOUNDATION_EXPORT long IPtProxyStartSnowflake(NSString* _Nullable ice, NSString* @param stun STUN URL. OPTIONAL. Defaults to stun:stun.stunprotocol.org:3478, if empty. -@param natProbe. OPTIONAL. Defaults to https://snowflake-broker.torproject.net:8443/probe, if empty. +@param natProbe OPTIONAL. Defaults to https://snowflake-broker.torproject.net:8443/probe, if empty. @param logFile Name of log file. OPTIONAL. Defaults to STDERR. diff --git a/IPtProxy.xcframework/ios-arm64_x86_64-simulator/IPtProxy.framework/Versions/A/IPtProxy b/IPtProxy.xcframework/ios-arm64_x86_64-simulator/IPtProxy.framework/Versions/A/IPtProxy index 3fe446f6cd89df83e9f9a17bd984fd7ff4edc8a9..270e9649ad53539c3aab73f02eb6a63ef1cf1ddc 100644 Binary files a/IPtProxy.xcframework/ios-arm64_x86_64-simulator/IPtProxy.framework/Versions/A/IPtProxy and b/IPtProxy.xcframework/ios-arm64_x86_64-simulator/IPtProxy.framework/Versions/A/IPtProxy differ diff --git a/README.md b/README.md index 3a06dc8fd84b237328d5d93e610d1e74cb1015b6..a46d395a303791d7d628f2cb0c684e5f1c0b203c 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ IPtProxy is available through [CocoaPods](https://cocoapods.org). To install it, simply add the following line to your `Podfile`: ```ruby -pod 'IPtProxy', '~> 1.3' +pod 'IPtProxy', '~> 1.4' ``` ### Getting Started @@ -59,7 +59,7 @@ IPtProxy is available through [JitPack](https://jitpack.io). To install it, simply add the following line to your `build.gradle` file: ```groovy -implementation 'com.github.tladesignz:IPtProxy:1.3.0' +implementation 'com.github.tladesignz:IPtProxy:1.4.0' ``` And this to your root `build.gradle` at the end of repositories: @@ -125,8 +125,11 @@ If you want to compile it yourself, you'll need Go 1.16 as a prerequisite. You will also need Xcode installed when compiling for iOS and an Android NDK when compiling for Android. -If it's not already, add `$GOPATH/bin` to `$PATH`. The default location -for `$GOPATH` is `$HOME/go` +The build script needs the gomobile binary and will install it, if not available, yet. +However, you'll still need to make it accessible in your `$PATH`. + +So, if it's not already, add `$GOPATH/bin` to `$PATH`. The default location +for `$GOPATH` is `$HOME/go`: ```bash export PATH=$HOME/go/bin/:$PATH` diff --git a/jitpack.yml b/jitpack.yml index 20cdf79ba24f011d815ff5c75fea6363a59ed3b2..87d04bf877436ccafff9ae827265f63cb06279cf 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,3 +1,3 @@ install: - FILE="-Dfile=IPtProxy.aar" - - mvn install:install-file $FILE -DgroupId=com.github.tladesignz -DartifactId=IPtProxy -Dversion=1.3.0 -Dpackaging=aar -DgeneratePom=true -Dsources=IPtProxy-sources.jar + - mvn install:install-file $FILE -DgroupId=com.github.tladesignz -DartifactId=IPtProxy -Dversion=1.4.0 -Dpackaging=aar -DgeneratePom=true -Dsources=IPtProxy-sources.jar diff --git a/pom.xml b/pom.xml index 6823ad6f5d88e87b3c8be0c4603f97eba48ebee8..a6061f3b284c3223ec2c544c4d1ff91e5d159282 100644 --- a/pom.xml +++ b/pom.xml @@ -5,5 +5,5 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.github.tladesignz</groupId> <artifactId>IPtProxy</artifactId> - <version>1.3.0</version> + <version>1.4.0</version> </project>