xcake 0.6.23 → 0.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd5d71c3ac6a1f9f2c04fd05d10c70c14194f98
-  data.tar.gz: 1955097615457d19444a8d39c2012f69e8401875
+  metadata.gz: 9cad5e364fd8796956e7f5c702ecf6cecd9529d6
+  data.tar.gz: f53b54c60cc0702763a4f6af3bffaf13e53f5b65
 SHA512:
-  metadata.gz: a562a1e293bebe3b982ed04203de827bf998d937d1d8d9762e88c0d93c90981cafafb875e8979956f5e639020d27bb6f89d69ac75a98f2f0d203866419da3d78
-  data.tar.gz: f05d12ca029db9a1911bc5dbcac92ec1b464e7e658554b65b27169a54075d15ac8c6b66625064cc231705b5035aaaeaef92f87e0fa8e5cb1f48a9581ac4b7211
+  metadata.gz: f5ca8ef563ceeaf851fca749ba9347eb65298e83d97739c6dc0db35ccb86f63abcbe9c8a6a9ee69f8a7ab306ad6d8fa2734821e941d746f6906cfe9a140cf6a2
+  data.tar.gz: 2c6b1a9ad42bb0c550095cfdbfec8376b3af7ff7c95afd692925a5975a2706357444f5ea79653737abbb45145560ae6562fb151d727942ff126498064501f777

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v0.6.24
+=======
+- Fixed bug where Localized Files would show up multiple times in Xcode for each language.
+
 v0.6.23
 =======
 - Adds support for Localized Files.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xcake (0.6.23)
+    xcake (0.6.24)
       activesupport (< 5)
       claide (>= 0.9.1, < 2.0)
       cork

data/lib/xcake/file_reference_installer.rb

@@ -56,14 +56,13 @@ module Xcake
       # the first non-variatn group
       #
       # Otherwise normal behaviour
-      native_group = @context.native_object_for(node.parent)
+      native_group = @context.native_object_for(node)
 
       # Make sure this is the correct parent in variant groups
       #
       # TODO: Remove this duplication of the .lproj and node path code.
       # Also remove need for the name hack.
       if node.parent.component.include?(".lproj")
-        native_group.name = node.component
         group_path = Pathname.new node.parent.parent.path
       else
         group_path = Pathname.new node.parent.path

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = '0.6.23'.freeze
+  VERSION = '0.6.24'.freeze
 end

data/lib/xcake/xcode/project.rb

@@ -129,23 +129,29 @@ module Xcake
       #
       def new_group(node)
 
-        return main_group unless node
+        parent = node.parent
+        return main_group unless parent
 
-        if node.component.include?(".lproj")
+        if parent.component.include?(".lproj")
 
-          group = main_group.find_subpath(node.parent.path, true) unless group
+          group = main_group.find_subpath(parent.parent.path, true) unless group
 
-          variant_group = group.project.new(PBXVariantGroup)
-          variant_group.set_source_tree(:group)
-          group.children << variant_group
+          variant_group = group[node.component]
+
+          unless variant_group
+            variant_group = group.project.new(PBXVariantGroup)
+            variant_group.name = node.component
+            variant_group.set_source_tree(:group)
+            group.children << variant_group
+          end
 
           group = variant_group
         else
-          group = main_group.find_subpath(node.path, true) unless group
+          group = main_group.find_subpath(parent.path, true) unless group
         end
 
         #TODO: Does this work with this new system
-        ensure_parent_path(group, node)
+        ensure_parent_path(group, parent)
 
         group
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.6.23
+  version: 0.6.24
 platform: ruby
 authors:
 - James Campbell