From 1d3071bdc4fecaad0e3373d25460d075964f58ea Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Mon, 24 Sep 2018 16:38:29 +0200 Subject: [PATCH 1/5] Set podspec version statically Podspecs are standalone files. Partially reverts 4cbf935dea16959951b3a456a2ff290b24349359. --- TunnelKit.podspec | 2 +- ci/set_version.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/TunnelKit.podspec b/TunnelKit.podspec index 1f7d695..d56eca7 100644 --- a/TunnelKit.podspec +++ b/TunnelKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "TunnelKit" - s.version = File.read("ci/VERSION") + s.version = "1.1.0" s.summary = "Non-official OpenVPN client for Apple platforms." s.homepage = "https://github.com/keeshux/tunnelkit" diff --git a/ci/set_version.sh b/ci/set_version.sh index ac043b4..c1a576d 100755 --- a/ci/set_version.sh +++ b/ci/set_version.sh @@ -4,3 +4,6 @@ VERSION=`cat $PWD/VERSION` BUILD=`git rev-list HEAD --count` agvtool new-marketing-version $VERSION agvtool new-version $BUILD + +echo "Setting podspec version to $VERSION..." +sed -i "" -E 's@s\.version( +)= "[0-9]+\.[0-9]+\.[0-9]+"$@s.version\1= "'$VERSION'"@g' TunnelKit.podspec From 5ea81e5b3205fdbee13e1e9e13a3e129eca7d763 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Mon, 24 Sep 2018 14:41:35 +0200 Subject: [PATCH 2/5] Add Swift version to podspec --- .swift-version | 1 - TunnelKit.podspec | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index bf77d54..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.2 diff --git a/TunnelKit.podspec b/TunnelKit.podspec index d56eca7..903b031 100644 --- a/TunnelKit.podspec +++ b/TunnelKit.podspec @@ -7,6 +7,7 @@ Pod::Spec.new do |s| s.license = { :type => "GPLv3", :file => "LICENSE" } s.author = { "Davide De Rosa" => "keeshux@gmail.com" } s.source = { :git => "https://github.com/keeshux/tunnelkit.git", :tag => "v#{s.version}" } + s.swift_version = "4.2" s.ios.deployment_target = "11.0" s.osx.deployment_target = "10.11" From 03ac05b9cf6709c60d74a8e085e74e377bfca7bd Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Mon, 24 Sep 2018 17:16:24 +0200 Subject: [PATCH 3/5] Fix case in repository URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 73dba43..5bdb2e9 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ pod 'TunnelKit' Download the library codebase locally: - $ git clone https://github.com/keeshux/TunnelKit.git + $ git clone https://github.com/keeshux/tunnelkit.git Assuming you have a [working CocoaPods environment][dep-cocoapods], setting up the library workspace only requires installing the pod dependencies: From 0d6959acd410281bb05ee5a4c0cef154bd3994eb Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Mon, 24 Sep 2018 19:06:41 +0200 Subject: [PATCH 4/5] Mention keep-alive behavior in CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6346d29..68d073d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project _will soonly adhere_ to [Semantic Versioning](https://semver.or - Minor adjustments for Xcode 10 / Swift 4.2. - Deep refactoring of control channel for future extensibility. - App group moved out of tunnel configuration, to make it more platform-agnostic and coherent to serialize. +- Keep-alive is disabled by default. - Several internal renamings. ### Fixed From d68bbac566a0df4ede407cfe9969011ea1e627e0 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sun, 23 Sep 2018 15:15:06 +0200 Subject: [PATCH 5/5] Set 1.1.0 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68d073d..075c863 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project _will soonly adhere_ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## 1.1.0 (2018-09-26) ### Added