diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec index d444d1055..7ff7ce00d 100644 --- a/iOS/FlipperKit.podspec +++ b/iOS/FlipperKit.podspec @@ -1,17 +1,17 @@ folly_compiler_flags = '-DFB_SONARKIT_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0' yoga_version = '~> 1.9' yogakit_version = '~>1.8' -sonarkit_version = '0.7.2' +flipperkit_version = '0.7.2' Pod::Spec.new do |spec| spec.name = 'FlipperKit' - spec.version = sonarkit_version + spec.version = flipperkit_version spec.license = { :type => 'MIT' } spec.homepage = 'https://github.com/facebook/Sonar' spec.summary = 'Sonar iOS podspec' spec.authors = 'Facebook' spec.static_framework = true spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag=> "v"+sonarkit_version } + :tag=> "v"+flipperkit_version } spec.module_name = 'FlipperKit' spec.platforms = { :ios => "8.4" } spec.default_subspecs = "Core" @@ -51,7 +51,7 @@ Pod::Spec.new do |spec| ss.dependency 'FlipperKit/FBCxxUtils' ss.dependency 'FlipperKit/CppBridge' ss.dependency 'Folly', '~>1.1' - ss.dependency 'Flipper', '~>'+sonarkit_version + ss.dependency 'Flipper', '~>'+flipperkit_version ss.dependency 'CocoaAsyncSocket', '~> 7.6' ss.dependency 'PeerTalk', '~>0.0.2' ss.dependency 'OpenSSL-Static', '1.0.2.c1' diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 10d5fb996..9fa7d30af 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -30,12 +30,12 @@ echo "✨ Making a new release..." DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SONAR_DIR="$DIR/../" -SONARKIT_PODSPEC_PATH="$SONAR_DIR/iOS/SonarKit.podspec" -SONAR_PODSPEC_PATH="$SONAR_DIR/xplat/Sonar/Sonar.podspec" +FLIPPERKIT_PODSPEC_PATH="$SONAR_DIR/iOS/FlipperKit.podspec" +FLIPPER_PODSPEC_PATH="$SONAR_DIR/xplat/Flipper/Flipper.podspec" SONAR_GETTING_STARTED_DOC="$SONAR_DIR/docs/getting-started.md" SPECS_DIR="$SONAR_DIR/Specs/" -SONARKIT_VERSION_TAG='sonarkit_version' -OLD_VERSION_POD_ARG=$(< "$SONAR_PODSPEC_PATH" grep "$SONARKIT_VERSION_TAG =" ) +FLIPPERKIT_VERSION_TAG='flipperkit_version' +OLD_VERSION_POD_ARG=$(< "$FLIPPER_PODSPEC_PATH" grep "$FLIPPERKIT_VERSION_TAG =" ) OLD_VERSION="${OLD_VERSION_POD_ARG##* }" echo "Currently released version is $OLD_VERSION, What should the version of the next release be?" @@ -44,27 +44,38 @@ read -r VERSION echo "Updating version $VERSION in podspecs, podfiles and in getting started docs..." # Update Podspec files and podfiles with correct version -echo "Updating $SONARKIT_PODSPEC_PATH" +echo "Updating $FLIPPERKIT_PODSPEC_PATH" if $darwin; then -sed -i '' "s/${SONARKIT_VERSION_TAG} = ${OLD_VERSION}/${SONARKIT_VERSION_TAG} = '${VERSION}'/" "$SONARKIT_PODSPEC_PATH" -echo "Updating $SONAR_PODSPEC_PATH" -sed -i '' "s/${SONARKIT_VERSION_TAG} = ${OLD_VERSION}/${SONARKIT_VERSION_TAG} = '${VERSION}'/" "$SONAR_PODSPEC_PATH" +sed -i '' "s/${FLIPPERKIT_VERSION_TAG} = ${OLD_VERSION}/${FLIPPERKIT_VERSION_TAG} = '${VERSION}'/" "$FLIPPERKIT_PODSPEC_PATH" +echo "Updating $FLIPPER_PODSPEC_PATH" +sed -i '' "s/${FLIPPERKIT_VERSION_TAG} = ${OLD_VERSION}/${FLIPPERKIT_VERSION_TAG} = '${VERSION}'/" "$FLIPPER_PODSPEC_PATH" echo "Updating $SONAR_GETTING_STARTED_DOC" -sed -i '' "s/${SONARKIT_VERSION_TAG} = ${OLD_VERSION}/${SONARKIT_VERSION_TAG} = '${VERSION}'/" "$SONAR_GETTING_STARTED_DOC" +sed -i '' "s/${FLIPPERKIT_VERSION_TAG} = ${OLD_VERSION}/${FLIPPERKIT_VERSION_TAG} = '${VERSION}'/" "$SONAR_GETTING_STARTED_DOC" else - sed -i "s/${SONARKIT_VERSION_TAG} = ${OLD_VERSION}/${SONARKIT_VERSION_TAG} = '${VERSION}'/" "$SONARKIT_PODSPEC_PATH" - echo "Updating $SONAR_PODSPEC_PATH" - sed -i "s/${SONARKIT_VERSION_TAG} = ${OLD_VERSION}/${SONARKIT_VERSION_TAG} = '${VERSION}'/" "$SONAR_PODSPEC_PATH" + sed -i "s/${FLIPPERKIT_VERSION_TAG} = ${OLD_VERSION}/${FLIPPERKIT_VERSION_TAG} = '${VERSION}'/" "$FLIPPERKIT_PODSPEC_PATH" + echo "Updating $FLIPPER_PODSPEC_PATH" + sed -i "s/${FLIPPERKIT_VERSION_TAG} = ${OLD_VERSION}/${FLIPPERKIT_VERSION_TAG} = '${VERSION}'/" "$FLIPPER_PODSPEC_PATH" echo "Updating $SONAR_GETTING_STARTED_DOC" - sed -i "s/${SONARKIT_VERSION_TAG} = ${OLD_VERSION}/${SONARKIT_VERSION_TAG} = '${VERSION}'/" "$SONAR_GETTING_STARTED_DOC" + sed -i "s/${FLIPPERKIT_VERSION_TAG} = ${OLD_VERSION}/${FLIPPERKIT_VERSION_TAG} = '${VERSION}'/" "$SONAR_GETTING_STARTED_DOC" fi # Copy Podfiles -mkdir "$SPECS_DIR/SonarKit/$VERSION" # New Specs dir for SonarKit podspec -mkdir "$SPECS_DIR/Sonar/$VERSION" # New Specs dir for Sonar podspec -echo "Copying SonarKit.podspec in Specs folder" -cp "$SONARKIT_PODSPEC_PATH" "$SPECS_DIR/SonarKit/$VERSION" # Copied SonarKit podspec -echo "Copying Sonar.podspec in Specs folder" -cp "$SONAR_PODSPEC_PATH" "$SPECS_DIR/Sonar/$VERSION" # Copied Sonar podspec + +if [ ! -d "$SPECS_DIR/FlipperKit/" ] # for file "if [-f /home/rama/file]" +then + mkdir "$SPECS_DIR/FlipperKit/" +fi + +if [ ! -d "$SPECS_DIR/Flipper/" ] # for file "if [-f /home/rama/file]" +then + mkdir "$SPECS_DIR/Flipper/" +fi + +mkdir "$SPECS_DIR/FlipperKit/$VERSION" # New Specs dir for FlipperKit podspec +mkdir "$SPECS_DIR/Flipper/$VERSION" # New Specs dir for Flipper podspec +echo "Copying FlipperKit.podspec in Specs folder" +cp "$FLIPPERKIT_PODSPEC_PATH" "$SPECS_DIR/FlipperKit/$VERSION" # Copied FlipperKit podspec +echo "Copying Flipper.podspec in Specs folder" +cp "$FLIPPER_PODSPEC_PATH" "$SPECS_DIR/Flipper/$VERSION" # Copied Flipper podspec echo "Bumping version number for android related files..." # Update Android related files diff --git a/xplat/Flipper/Flipper.podspec b/xplat/Flipper/Flipper.podspec index bad369aae..20dfc6b2d 100644 --- a/xplat/Flipper/Flipper.podspec +++ b/xplat/Flipper/Flipper.podspec @@ -1,13 +1,13 @@ -sonarkit_version = '0.7.2' +flipperkit_version = '0.7.2' Pod::Spec.new do |spec| spec.name = 'Flipper' - spec.version = sonarkit_version + spec.version = flipperkit_version spec.license = { :type => 'MIT' } spec.homepage = 'https://github.com/facebook/sonar' spec.summary = 'SonarKit core cpp code with network implementation' spec.authors = 'Facebook' spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :tag => 'v'+sonarkit_version } + :tag => 'v'+flipperkit_version } spec.module_name = 'Flipper' spec.public_header_files = 'xplat/Flipper/*.h' spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}'