Skip to content

New strategy for asset overrides. Fixes popup warnings #1145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 13, 2019
Merged

New strategy for asset overrides. Fixes popup warnings #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f730851
New strategy for asset overrides. Fixes popup warnings
ps2 Oct 12, 2019
4e5d38a
Add DefaultAssets.xcassets back to WatchApp target
ps2 Oct 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,7 @@ RemoteSettings.plist

# Framework development
Loop.xcworkspace

# Avoid checking in built assets
Loop/DerivedAssets.xcassets/
WatchApp/DerivedAssets.xcassets/
16 changes: 10 additions & 6 deletions Loop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,10 +378,12 @@
C17824A61E1AF91F00D9D25C /* BolusRecommendation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17824A41E1AD4D100D9D25C /* BolusRecommendation.swift */; };
C1814B86225E507C008D2D8E /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1814B85225E507C008D2D8E /* Sequence.swift */; };
C18C8C511D5A351900E043FB /* NightscoutDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C18C8C501D5A351900E043FB /* NightscoutDataManager.swift */; };
C1A3EED2235233E1007672E3 /* DerivedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C1A3EED1235233E1007672E3 /* DerivedAssets.xcassets */; };
C1A3EED423523551007672E3 /* DerivedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C1A3EED323523551007672E3 /* DerivedAssets.xcassets */; };
C1A3EED523535FFF007672E3 /* DefaultAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 894F71E11FFEC4D8007D365C /* DefaultAssets.xcassets */; };
C1C0BE2A224C0FA000C03B4D /* SwiftCharts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */; };
C1C6591C1E1B1FDA0025CC58 /* recommend_temp_basal_dropping_then_rising.json in Resources */ = {isa = PBXBuildFile; fileRef = C1C6591B1E1B1FDA0025CC58 /* recommend_temp_basal_dropping_then_rising.json */; };
C1C73F0D1DE3D0270022FC89 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C1C73F0F1DE3D0270022FC89 /* InfoPlist.strings */; };
C1D1405F22FB7ADF00DA6242 /* DerivedWatchAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C1D1405E22FB7ADF00DA6242 /* DerivedWatchAssets.xcassets */; };
C1D289B522F90A52003FFBD9 /* BasalDeliveryState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1D289B422F90A52003FFBD9 /* BasalDeliveryState.swift */; };
C1E2773E224177C000354103 /* ClockKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1E2773D224177C000354103 /* ClockKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
C1E2774822433D7A00354103 /* MKRingProgressView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1E2774722433D7A00354103 /* MKRingProgressView.framework */; };
Expand Down Expand Up @@ -1033,9 +1035,9 @@
C18A491422FCC22900FDA733 /* build-derived-watch-assets.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "build-derived-watch-assets.sh"; sourceTree = "<group>"; };
C18A491522FCC22900FDA733 /* copy-plugins.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "copy-plugins.sh"; sourceTree = "<group>"; };
C18C8C501D5A351900E043FB /* NightscoutDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NightscoutDataManager.swift; sourceTree = "<group>"; };
C1A3EED1235233E1007672E3 /* DerivedAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DerivedAssets.xcassets; sourceTree = "<group>"; };
C1A3EED323523551007672E3 /* DerivedAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DerivedAssets.xcassets; sourceTree = "<group>"; };
C1C6591B1E1B1FDA0025CC58 /* recommend_temp_basal_dropping_then_rising.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_temp_basal_dropping_then_rising.json; sourceTree = "<group>"; };
C1D1405822FB69CC00DA6242 /* DerivedAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DerivedAssets.xcassets; sourceTree = BUILT_PRODUCTS_DIR; };
C1D1405E22FB7ADF00DA6242 /* DerivedWatchAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DerivedWatchAssets.xcassets; sourceTree = BUILT_PRODUCTS_DIR; };
C1D197FE232CF92D0096D646 /* capture-build-details.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "capture-build-details.sh"; sourceTree = "<group>"; };
C1D289B422F90A52003FFBD9 /* BasalDeliveryState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasalDeliveryState.swift; sourceTree = "<group>"; };
C1E2773D224177C000354103 /* ClockKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ClockKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ClockKit.framework; sourceTree = DEVELOPER_DIR; };
Expand Down Expand Up @@ -1289,7 +1291,7 @@
43F5C2D41B92A4A6003EB13D /* Info.plist */,
43776F8F1B8022E90074EA36 /* AppDelegate.swift */,
43776F981B8022E90074EA36 /* DefaultAssets.xcassets */,
C1D1405822FB69CC00DA6242 /* DerivedAssets.xcassets */,
C1A3EED1235233E1007672E3 /* DerivedAssets.xcassets */,
43776F9A1B8022E90074EA36 /* LaunchScreen.storyboard */,
43776F951B8022E90074EA36 /* Main.storyboard */,
43E344A01B9E144300C85C07 /* Extensions */,
Expand Down Expand Up @@ -1324,7 +1326,7 @@
isa = PBXGroup;
children = (
894F71E11FFEC4D8007D365C /* DefaultAssets.xcassets */,
C1D1405E22FB7ADF00DA6242 /* DerivedWatchAssets.xcassets */,
C1A3EED323523551007672E3 /* DerivedAssets.xcassets */,
C1C73F0F1DE3D0270022FC89 /* InfoPlist.strings */,
43F5C2D61B92A4DC003EB13D /* Info.plist */,
43A943741B926B7B0051FA24 /* Interface.storyboard */,
Expand Down Expand Up @@ -2230,6 +2232,7 @@
C13255D6223E7BE2008AF50C /* BolusProgressTableViewCell.xib in Resources */,
43FCBBC21E51710B00343C1B /* LaunchScreen.storyboard in Resources */,
7D70764F1FE06EE1004AC8EA /* InfoPlist.strings in Resources */,
C1A3EED2235233E1007672E3 /* DerivedAssets.xcassets in Resources */,
7D7076631FE06EE4004AC8EA /* Localizable.strings in Resources */,
43776F971B8022E90074EA36 /* Main.storyboard in Resources */,
C1265BEE231BF7F700652B84 /* DefaultAssets.xcassets in Resources */,
Expand All @@ -2240,9 +2243,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C1D1405F22FB7ADF00DA6242 /* DerivedWatchAssets.xcassets in Resources */,
C1C73F0D1DE3D0270022FC89 /* InfoPlist.strings in Resources */,
43A943761B926B7B0051FA24 /* Interface.storyboard in Resources */,
C1A3EED523535FFF007672E3 /* DefaultAssets.xcassets in Resources */,
C1A3EED423523551007672E3 /* DerivedAssets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
6 changes: 6 additions & 0 deletions Loop/DerivedAssets.xcassets/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
5 changes: 2 additions & 3 deletions Scripts/build-derived-assets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@

echo "Building DerivedAssets.xcassets"

output="${BUILT_PRODUCTS_DIR}/DerivedAssets.xcassets"
cp -a "${PROJECT_DIR}/Loop/DefaultAssets.xcassets/." "$output"
output="${PROJECT_DIR}/Loop/DerivedAssets.xcassets"

override="${PROJECT_DIR}/../AssetOverrides.xcassets/."
override="${PROJECT_DIR}/../AdditionalAssets.xcassets/."

if [ -d $override ]; then
echo "Adding asset overrides to DerivedAssets.xcassets"
Expand Down
10 changes: 4 additions & 6 deletions Scripts/build-derived-watch-assets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
#
# Copyright © 2019 LoopKit Authors. All rights reserved.

echo "Building WatchDerivedAssets.xcassets"
echo "Building DerivedAssets.xcassets for Watch App"

watch_output="${BUILT_PRODUCTS_DIR}/DerivedWatchAssets.xcassets"
cp -a "${PROJECT_DIR}/WatchApp/DefaultAssets.xcassets/." "$watch_output"
watch_output="${PROJECT_DIR}/WatchApp/DerivedAssets.xcassets"


watch_override="${PROJECT_DIR}/../WatchAssetOverrides.xcassets/."
watch_override="${PROJECT_DIR}/../AdditionalWatchAssets.xcassets/."

if [ -d $watch_override ]; then
echo "Adding asset overrides to DerivedWatchAssets.xcassets"
echo "Adding asset overrides to WatchApp/DerivedAssets.xcassets"
cp -a "$watch_override" "$watch_output"
fi
6 changes: 6 additions & 0 deletions WatchApp/DerivedAssets.xcassets/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}