From 19fbfd116e2887cbb204a1cdb63446debe6b50b3 Mon Sep 17 00:00:00 2001 From: Sylvain Bettinelli Date: Thu, 20 Aug 2026 16:37:54 +0000 Subject: [PATCH] =?UTF-8?q?pbxproj=20:=20IntervalEngine=20=C3=A9tait=20d?= =?UTF-8?q?=C3=A9clar=C3=A9=20deux=20fois?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Deux sessions ont ajouté le même fichier à la cible CoachWatch en parallèle — l'une depuis Xcode sur le Mac (be1ffec), l'autre en éditant le pbxproj sous Linux (a04dfc4). Le rebase a fusionné les deux sans conflit, puisqu'elles touchaient des lignes différentes : le fichier se retrouvait déclaré deux fois et Xcode aurait refusé de compiler pour redéclaration. Les entrées Xcode sont conservées, les miennes retirées. RouteFilter et LocationTracker n'étaient pas concernés. Repère de contrôle, à refaire après toute fusion touchant le pbxproj : chaque fichier doit rendre 2 pour `grep -c '.swift in Sources'` — une seule cible. 4 signale un doublon. Co-Authored-By: Claude Opus 5 (1M context) --- ios/App/App.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 67d334b..462be68 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -18,7 +18,6 @@ 2F86A358498667B66E5EFC60 /* CoachRoutineBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97BC6E07E6984342AE95C312 /* CoachRoutineBridge.swift */; }; 2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; }; 3E6740C521EF14892687BCF7 /* CoachWatch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 2517374227A4072A4D6AFC15 /* CoachWatch.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - C0AC4E1Z0011OUTDOOR0001 /* IntervalEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0AC4E1Z0010OUTDOOR0001 /* IntervalEngine.swift */; }; C0AC4E1Z0011OUTDOOR0002 /* RouteFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0AC4E1Z0010OUTDOOR0002 /* RouteFilter.swift */; }; C0AC4E1Z0011OUTDOOR0003 /* LocationTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0AC4E1Z0010OUTDOOR0003 /* LocationTracker.swift */; }; 436442D6BF54833C59D9E668 /* WorkoutManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AC9C9B9971F55027D227A06 /* WorkoutManager.swift */; }; @@ -165,7 +164,6 @@ 88D1DD5D302B46B000B9BA42 /* CoachAuth.swift.example */ = {isa = PBXFileReference; lastKnownFileType = text; path = CoachAuth.swift.example; sourceTree = ""; }; 88F28EB02FBB330E00E8306E /* CoachWorkoutObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoachWorkoutObserver.swift; sourceTree = ""; }; 8A06CDFF5B4F7852B6329862 /* ContentView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; - C0AC4E1Z0010OUTDOOR0001 /* IntervalEngine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = IntervalEngine.swift; sourceTree = ""; }; C0AC4E1Z0010OUTDOOR0002 /* RouteFilter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RouteFilter.swift; sourceTree = ""; }; C0AC4E1Z0010OUTDOOR0003 /* LocationTracker.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LocationTracker.swift; sourceTree = ""; }; 8AC9C9B9971F55027D227A06 /* WorkoutManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = WorkoutManager.swift; sourceTree = ""; }; @@ -344,7 +342,6 @@ 8AC9C9B9971F55027D227A06 /* WorkoutManager.swift */, C0AC4E1Z0010OUTDOOR0003 /* LocationTracker.swift */, C0AC4E1Z0010OUTDOOR0002 /* RouteFilter.swift */, - C0AC4E1Z0010OUTDOOR0001 /* IntervalEngine.swift */, 3342ACCE085010828CF63565 /* Assets.xcassets */, ); path = CoachWatch; @@ -609,7 +606,6 @@ 436442D6BF54833C59D9E668 /* WorkoutManager.swift in Sources */, C0AC4E1Z0011OUTDOOR0003 /* LocationTracker.swift in Sources */, C0AC4E1Z0011OUTDOOR0002 /* RouteFilter.swift in Sources */, - C0AC4E1Z0011OUTDOOR0001 /* IntervalEngine.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };