Merge pull request #4272 from CocoaPods/seg-remove-dylib-versions

[PodTargetInstaller] Dont set the dylib version settings

CHANGELOG.md

@@ -45,16 +45,21 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 * Podfile generated by `pod init` now specifies iOS 8.0 as the default platform
   and includes `use_frameworks!` for Swift projects.  
   [Jamie Evans](https://github.com/JamieREvans)
+
 * Support for the new `tvos` platform.  
   [Boris Bügling](https://github.com/neonichu)
   [#4152](https://github.com/CocoaPods/CocoaPods/pull/4152)
 
-
 * Either generate just one pod target or generate it once for each target
   definition.  
   [Marius Rackwitz](https://github.com/mrackwitz)
   [#4034](https://github.com/CocoaPods/CocoaPods/issues/4034)
 
+* Stop setting `DYLIB_CURRENT_VERSION`, `CURRENT_PROJECT_VERSION`, and
+  `DYLIB_COMPATIBILITY_VERSION` for pods integrated as dynamic frameworks.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4083](https://github.com/CocoaPods/CocoaPods/issues/4083)
+
 
 ## 0.39.0.beta.4 (2015-09-02)
 

lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -36,25 +36,6 @@ module Pod
 
       private
 
-      # Adds the project/library and compatibility versions, which are only
-      # applicable to dynamic libraries.
-      #
-      # @return [Hash{String => String}]
-      #
-      def custom_build_settings
-        settings = super
-        if target.requires_frameworks?
-          version = target.root_spec.version
-          project_version = [version.major, version.minor, version.patch].join('.')
-          compatibility_version = version.major
-          compatibility_version = project_version if compatibility_version < 1
-          settings['CURRENT_PROJECT_VERSION'] = project_version
-          settings['DYLIB_COMPATIBILITY_VERSION'] = compatibility_version.to_s
-          settings['DYLIB_CURRENT_VERSION'] = '$(CURRENT_PROJECT_VERSION)'
-        end
-        settings
-      end
-
       #-----------------------------------------------------------------------#
 
       SOURCE_FILE_EXTENSIONS = Sandbox::FileAccessor::SOURCE_FILE_EXTENSIONS

cocoapods-integration-specs @ 8732aa41

-Subproject commit 6989ebd54e1aeae47706b375057791b4f2c93bbb
+Subproject commit 8732aa416f7729d06df8ae4ea838837f37a0db9f

spec/unit/installer/target_installer/pod_target_installer_spec.rb

@@ -295,49 +295,6 @@ module Pod
           end
         end
       end
-
-      #--------------------------------------------------------------------------------#
-
-      describe 'concerning framework versions' do
-        before do
-          @pod_target.stubs(:requires_frameworks? => true)
-          @spec.stubs(:version => Version.new('1.2.3'))
-        end
-
-        it 'sets the project and library version' do
-          settings = @installer.send(:custom_build_settings)
-          settings['CURRENT_PROJECT_VERSION'].should == '1.2.3'
-          settings['DYLIB_CURRENT_VERSION'].should == '$(CURRENT_PROJECT_VERSION)'
-        end
-
-        it 'sets the library compatibility version to the major version' do
-          settings = @installer.send(:custom_build_settings)
-          settings['DYLIB_COMPATIBILITY_VERSION'].should == '1'
-        end
-
-        it 'sets the library compatibility version to the exact version when it is less than v1 (because SemVer makes no promises)' do
-          @spec.stubs(:version => Version.new('0.1.2'))
-          settings = @installer.send(:custom_build_settings)
-          settings['DYLIB_COMPATIBILITY_VERSION'].should == '0.1.2'
-        end
-
-        describe 'with weird version numbers' do
-          handles = -> (version, project_version, compatibility_version) do
-            it "handles #{version}" do
-              @spec.stubs(:version => Version.new(version))
-              settings = @installer.send(:custom_build_settings)
-              settings['CURRENT_PROJECT_VERSION'].should == project_version
-              settings['DYLIB_COMPATIBILITY_VERSION'].should == compatibility_version
-            end
-          end
-
-          handles['1.alpha', '1.0.0', '1']
-          handles['0.1-alpha', '0.1.0', '0.1.0']
-          handles['1.2.3.4', '1.2.3', '1']
-          handles['0.2.3.4', '0.2.3', '0.2.3']
-          handles['1.alpha.2', '1.0.0', '1']
-        end
-      end
     end
   end
 end