Merge pull request #10950 from CocoaPods/development_language

Use `${DEVELOPMENT_LANGUAGE}` as the default `CFBundleDevelopmentRegion` value in any generated `Info.plist`.
CocoaPods · Sep 17, 2021 · f120f9f · f120f9f
2 parents c949589 + f55c026
commit f120f9f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Enhancements
 
-* None.  
+* Use `${DEVELOPMENT_LANGUAGE}` as the default `CFBundleDevelopmentRegion` value in any generated `Info.plist`.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10950](https://github.com/CocoaPods/CocoaPods/pull/10950)
 
 ##### Bug Fixes
 

diff --git a/Rakefile b/Rakefile
@@ -219,7 +219,7 @@ begin
         exit 1
       end
       title 'Running Integration tests'
-      rm_rf 'tmp'
+      FileUtils.rm_rf 'tmp'
       title 'Building all the fixtures'
       sh('bundle exec bacon spec/integration.rb') {}
       title 'Storing fixtures'
@@ -228,8 +228,8 @@ begin
         name = source.match(%r{^tmp/(.+)/transformed$})[1]
         destination = "spec/cocoapods-integration-specs/#{name}/after"
         if File.exist?(destination)
-          rm_rf destination
-          mv source, destination
+          FileUtils.rm_rf destination
+          FileUtils.mv source, destination
         end
       end
 

diff --git a/lib/cocoapods/generator/info_plist_file.rb b/lib/cocoapods/generator/info_plist_file.rb
@@ -112,7 +112,7 @@ def info
           'CFBundleSignature' => '????',
           'CFBundleVersion' => '${CURRENT_PROJECT_VERSION}',
           'NSPrincipalClass' => '',
-          'CFBundleDevelopmentRegion' => 'en',
+          'CFBundleDevelopmentRegion' => '${PODS_DEVELOPMENT_LANGUAGE}',
         }
 
         info['CFBundleExecutable'] = '${EXECUTABLE_NAME}' if bundle_package_type != :bndl

diff --git a/lib/cocoapods/target/build_settings.rb b/lib/cocoapods/target/build_settings.rb
@@ -602,6 +602,11 @@ def initialize(target, non_library_spec = nil, configuration: nil)
           target.pod_target_srcroot
         end
 
+        # @return [String]
+        define_build_settings_method :pods_development_language, :build_setting => true do
+          '${DEVELOPMENT_LANGUAGE}'
+        end
+
         #-------------------------------------------------------------------------#
 
         # @!group Frameworks

diff --git a/spec/cocoapods-integration-specs b/spec/cocoapods-integration-specs
diff --git a/spec/unit/generator/info_plist_file_spec.rb b/spec/unit/generator/info_plist_file_spec.rb
@@ -20,7 +20,7 @@ module Pod
       file = temporary_directory + 'Info.plist'
       generator.save_as(file)
       Xcodeproj::Plist.read_from_path(file).should == {
-        'CFBundleDevelopmentRegion' => 'en',
+        'CFBundleDevelopmentRegion' => '${PODS_DEVELOPMENT_LANGUAGE}',
         'CFBundleExecutable' => '${EXECUTABLE_NAME}',
         'CFBundleIdentifier' => '${PRODUCT_BUNDLE_IDENTIFIER}',
         'CFBundleInfoDictionaryVersion' => '6.0',
@@ -38,7 +38,7 @@ module Pod
       file = temporary_directory + 'Info.plist'
       generator.save_as(file)
       Xcodeproj::Plist.read_from_path(file).should == {
-        'CFBundleDevelopmentRegion' => 'en',
+        'CFBundleDevelopmentRegion' => '${PODS_DEVELOPMENT_LANGUAGE}',
         'CFBundleExecutable' => '${EXECUTABLE_NAME}',
         'CFBundleIdentifier' => '${PRODUCT_BUNDLE_IDENTIFIER}',
         'CFBundleInfoDictionaryVersion' => '6.0',
@@ -56,7 +56,7 @@ module Pod
       file = temporary_directory + 'Info.plist'
       generator.save_as(file)
       Xcodeproj::Plist.read_from_path(file).should == {
-        'CFBundleDevelopmentRegion' => 'en',
+        'CFBundleDevelopmentRegion' => '${PODS_DEVELOPMENT_LANGUAGE}',
         'CFBundleExecutable' => '${EXECUTABLE_NAME}',
         'CFBundleIdentifier' => '${PRODUCT_BUNDLE_IDENTIFIER}',
         'CFBundleInfoDictionaryVersion' => '6.0',
@@ -74,7 +74,7 @@ module Pod
       file = temporary_directory + 'Info.plist'
       generator.save_as(file)
       Xcodeproj::Plist.read_from_path(file).should == {
-        'CFBundleDevelopmentRegion' => 'en',
+        'CFBundleDevelopmentRegion' => '${PODS_DEVELOPMENT_LANGUAGE}',
         'CFBundleExecutable' => '${EXECUTABLE_NAME}',
         'CFBundleIdentifier' => '${PRODUCT_BUNDLE_IDENTIFIER}',
         'CFBundleInfoDictionaryVersion' => '6.0',