diff --git a/MOBILE/ios/.gitignore b/MOBILE/ios/.gitignore index 9dc6204..a98bc5c 100644 --- a/MOBILE/ios/.gitignore +++ b/MOBILE/ios/.gitignore @@ -1 +1,2 @@ /oonimkall.framework/ +/oonimkall.* diff --git a/MOBILE/template.podspec b/MOBILE/template.podspec index cc74bae..e801ef7 100644 --- a/MOBILE/template.podspec +++ b/MOBILE/template.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = "oonimkall" s.version = "@VERSION@" - s.summary = "OONI Probe Engine for iOS" + s.summary = "OONI Probe Library for iOS" s.author = "Simone Basso" - s.homepage = "https://github.com/ooni/probe-engine" + s.homepage = "https://github.com/ooni/probe-cli" s.license = { :type => "BSD" } s.source = { - :http => "https://dl.bintray.com/ooni/ios/oonimkall-@VERSION@.framework.zip" + :http => "https://github.com/ooni/probe-cli/releases/download/@RELEASE@/oonimkall.framework.zip" } s.platform = :ios, "9.0" s.ios.vendored_frameworks = "oonimkall.framework" diff --git a/MOBILE/template.pom b/MOBILE/template.pom index cc116f4..bbf7f53 100644 --- a/MOBILE/template.pom +++ b/MOBILE/template.pom @@ -9,7 +9,7 @@ aar oonimkall - OONI Probe for Android + OONI Probe Library for Android https://github.com/ooni/probe-cli diff --git a/build-ios.bash b/build-ios.bash index a2cc5a6..ce93e09 100755 --- a/build-ios.bash +++ b/build-ios.bash @@ -7,3 +7,9 @@ go get -u golang.org/x/mobile/cmd/gomobile gomobile init output=MOBILE/ios/oonimkall.framework gomobile bind -target=ios -o $output -ldflags="-s -w" ./pkg/oonimkall +release=$(git describe --tags) +version=$(date -u +%Y.%m.%d-%H%M%S) +podspecfile=./MOBILE/ios/oonimkall.podspec +(cd ./MOBILE/ios && rm -f oonimkall.framework.zip && zip -yr oonimkall.framework.zip oonimkall.framework) +podspectemplate=./MOBILE/template.podspec +cat $podspectemplate|sed -e "s/@VERSION@/$version/g" -e "s/@RELEASE@/$release/g" > $podspecfile