Skip to content

Commit 350a2ef

Browse files
sauluriassaulurias
authored
Merge pull request #73 from saulurias/saulurias-fixment
Saulurias fixment
2 parents c459f6a + 21a762e commit 350a2ef

File tree

13 files changed

+436
-321
lines changed

13 files changed

+436
-321
lines changed

‎Podfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use_frameworks!
33

44
target 'SwiftWeather' do
55
pod 'SwiftyJSON'
6+
pod 'FacebookShare'
67
end
78

89
abstract_target 'Tests' do

‎Podfile.lock‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,53 @@
11
PODS:
2+
- Bolts (1.9.0):
3+
- Bolts/AppLinks (= 1.9.0)
4+
- Bolts/Tasks (= 1.9.0)
5+
- Bolts/AppLinks (1.9.0):
6+
- Bolts/Tasks
7+
- Bolts/Tasks (1.9.0)
8+
- FacebookCore (0.3.0):
9+
- Bolts (~> 1.8)
10+
- FBSDKCoreKit (~> 4.27)
11+
- FacebookShare (0.3.0):
12+
- Bolts (~> 1.8)
13+
- FacebookCore (~> 0.3)
14+
- FBSDKCoreKit (~> 4.27)
15+
- FBSDKShareKit (~> 4.27)
16+
- FBSDKCoreKit (4.33.0):
17+
- Bolts (~> 1.7)
18+
- FBSDKShareKit (4.33.0):
19+
- FBSDKCoreKit (~> 4.33.0)
220
- Nimble (7.0.3)
321
- Quick (1.2.0)
422
- SwiftyJSON (4.0.0)
523

624
DEPENDENCIES:
25+
- FacebookShare
726
- Nimble
827
- Quick
928
- SwiftyJSON
1029

30+
SPEC REPOS:
31+
https://github.com/CocoaPods/Specs.git:
32+
- Bolts
33+
- FacebookCore
34+
- FacebookShare
35+
- FBSDKCoreKit
36+
- FBSDKShareKit
37+
- Nimble
38+
- Quick
39+
- SwiftyJSON
40+
1141
SPEC CHECKSUMS:
42+
Bolts: ac6567323eac61e203f6a9763667d0f711be34c8
43+
FacebookCore: 3ffa190a3f1f96cec0e44d3fc221bc322c595ffa
44+
FacebookShare: 0469964297ebd75f052be2c5083389a4208e82b7
45+
FBSDKCoreKit: 572b047a7e029bc44542bcf8a59414e7ff2b543e
46+
FBSDKShareKit: 1869cb24db2cea90666a50cb9d568deb38e2d16e
1247
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
1348
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
1449
SwiftyJSON: 070dabdcb1beb81b247c65ffa3a79dbbfb3b48aa
1550

16-
PODFILE CHECKSUM: 3509c4c63edbe9a7b092aab021ca4e248077b966
51+
PODFILE CHECKSUM: 28f6397e3ce4b1c0258bb51e941d6155f9477e75
1752

18-
COCOAPODS: 1.3.1
53+
COCOAPODS: 1.5.0

‎SwiftWeather.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@
316316
AECBA5E01B836BF20004A536 /* Resources */,
317317
ADD0EBFC1C562E52002D8392 /* ShellScript */,
318318
6691608BB84CB91D5EDADE36 /* [CP] Embed Pods Frameworks */,
319-
32518075271F3E332F6C65A9 /* [CP] Copy Pods Resources */,
320319
);
321320
buildRules = (
322321
);
@@ -336,7 +335,6 @@
336335
AECBA5F31B836BF20004A536 /* Frameworks */,
337336
AECBA5F41B836BF20004A536 /* Resources */,
338337
3211EE071253F1D6513A17BA /* [CP] Embed Pods Frameworks */,
339-
DD8CF84103252EE893788AE8 /* [CP] Copy Pods Resources */,
340338
);
341339
buildRules = (
342340
);
@@ -357,7 +355,6 @@
357355
AECBA5FE1B836BF20004A536 /* Frameworks */,
358356
AECBA5FF1B836BF20004A536 /* Resources */,
359357
EC9ED72913B1DE182823A53C /* [CP] Embed Pods Frameworks */,
360-
1B9DE6A0CE065E744D7CB96E /* [CP] Copy Pods Resources */,
361358
);
362359
buildRules = (
363360
);
@@ -381,6 +378,7 @@
381378
TargetAttributes = {
382379
AECBA5E11B836BF20004A536 = {
383380
CreatedOnToolsVersion = 7.0;
381+
DevelopmentTeam = 32GB2HU6K5;
384382
LastSwiftMigration = 0900;
385383
};
386384
AECBA5F51B836BF20004A536 = {
@@ -445,21 +443,6 @@
445443
/* End PBXResourcesBuildPhase section */
446444

447445
/* Begin PBXShellScriptBuildPhase section */
448-
1B9DE6A0CE065E744D7CB96E /* [CP] Copy Pods Resources */ = {
449-
isa = PBXShellScriptBuildPhase;
450-
buildActionMask = 2147483647;
451-
files = (
452-
);
453-
inputPaths = (
454-
);
455-
name = "[CP] Copy Pods Resources";
456-
outputPaths = (
457-
);
458-
runOnlyForDeploymentPostprocessing = 0;
459-
shellPath = /bin/sh;
460-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests-SwiftWeatherUITests/Pods-Tests-SwiftWeatherUITests-resources.sh\"\n";
461-
showEnvVarsInLog = 0;
462-
};
463446
2A25B97139655BE3B502C748 /* [CP] Check Pods Manifest.lock */ = {
464447
isa = PBXShellScriptBuildPhase;
465448
buildActionMask = 2147483647;
@@ -498,32 +481,27 @@
498481
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests-SwiftWeatherTests/Pods-Tests-SwiftWeatherTests-frameworks.sh\"\n";
499482
showEnvVarsInLog = 0;
500483
};
501-
32518075271F3E332F6C65A9 /* [CP] Copy Pods Resources */ = {
502-
isa = PBXShellScriptBuildPhase;
503-
buildActionMask = 2147483647;
504-
files = (
505-
);
506-
inputPaths = (
507-
);
508-
name = "[CP] Copy Pods Resources";
509-
outputPaths = (
510-
);
511-
runOnlyForDeploymentPostprocessing = 0;
512-
shellPath = /bin/sh;
513-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwiftWeather/Pods-SwiftWeather-resources.sh\"\n";
514-
showEnvVarsInLog = 0;
515-
};
516484
6691608BB84CB91D5EDADE36 /* [CP] Embed Pods Frameworks */ = {
517485
isa = PBXShellScriptBuildPhase;
518486
buildActionMask = 2147483647;
519487
files = (
520488
);
521489
inputPaths = (
522490
"${SRCROOT}/Pods/Target Support Files/Pods-SwiftWeather/Pods-SwiftWeather-frameworks.sh",
491+
"${BUILT_PRODUCTS_DIR}/Bolts/Bolts.framework",
492+
"${BUILT_PRODUCTS_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework",
493+
"${BUILT_PRODUCTS_DIR}/FBSDKShareKit/FBSDKShareKit.framework",
494+
"${BUILT_PRODUCTS_DIR}/FacebookCore/FacebookCore.framework",
495+
"${BUILT_PRODUCTS_DIR}/FacebookShare/FacebookShare.framework",
523496
"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
524497
);
525498
name = "[CP] Embed Pods Frameworks";
526499
outputPaths = (
500+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Bolts.framework",
501+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework",
502+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKShareKit.framework",
503+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FacebookCore.framework",
504+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FacebookShare.framework",
527505
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
528506
);
529507
runOnlyForDeploymentPostprocessing = 0;
@@ -580,21 +558,6 @@
580558
shellPath = /bin/sh;
581559
shellScript = "token_file=.access_tokens/openweathermap\ntoken=\"$(cat $token_file)\"\nif [ \"$token\" ]; then\nplutil -replace OWMAccessToken -string $token $TARGET_BUILD_DIR/$INFOPLIST_PATH\nelse\necho 'error: Missing OpenWeatherMap access token'\nopen 'http://openweathermap.org/appid'\necho \"error: Get an access token from <http://openweathermap.org/appid>, then create a new file at $token_file that contains the access token.\"\nexit 1\nfi";
582560
};
583-
DD8CF84103252EE893788AE8 /* [CP] Copy Pods Resources */ = {
584-
isa = PBXShellScriptBuildPhase;
585-
buildActionMask = 2147483647;
586-
files = (
587-
);
588-
inputPaths = (
589-
);
590-
name = "[CP] Copy Pods Resources";
591-
outputPaths = (
592-
);
593-
runOnlyForDeploymentPostprocessing = 0;
594-
shellPath = /bin/sh;
595-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests-SwiftWeatherTests/Pods-Tests-SwiftWeatherTests-resources.sh\"\n";
596-
showEnvVarsInLog = 0;
597-
};
598561
EC9ED72913B1DE182823A53C /* [CP] Embed Pods Frameworks */ = {
599562
isa = PBXShellScriptBuildPhase;
600563
buildActionMask = 2147483647;
@@ -805,7 +768,7 @@
805768
baseConfigurationReference = 900AFFBB41C69FC277CB0A33 /* Pods-SwiftWeather.debug.xcconfig */;
806769
buildSettings = {
807770
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
808-
DEVELOPMENT_TEAM = "";
771+
DEVELOPMENT_TEAM = 32GB2HU6K5;
809772
INFOPLIST_FILE = SwiftWeather/Info.plist;
810773
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
811774
PRODUCT_BUNDLE_IDENTIFIER = com.rushjet.SwiftWeather;
@@ -820,7 +783,7 @@
820783
baseConfigurationReference = E835C39D4B929F35B6A57B12 /* Pods-SwiftWeather.release.xcconfig */;
821784
buildSettings = {
822785
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
823-
DEVELOPMENT_TEAM = "";
786+
DEVELOPMENT_TEAM = 32GB2HU6K5;
824787
INFOPLIST_FILE = SwiftWeather/Info.plist;
825788
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
826789
PRODUCT_BUNDLE_IDENTIFIER = com.rushjet.SwiftWeather;

‎SwiftWeather/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"idiom" : "iphone",
515
"size" : "29x29",
@@ -30,6 +40,16 @@
3040
"size" : "60x60",
3141
"scale" : "3x"
3242
},
43+
{
44+
"idiom" : "ipad",
45+
"size" : "20x20",
46+
"scale" : "1x"
47+
},
48+
{
49+
"idiom" : "ipad",
50+
"size" : "20x20",
51+
"scale" : "2x"
52+
},
3353
{
3454
"idiom" : "ipad",
3555
"size" : "29x29",
@@ -59,6 +79,16 @@
5979
"idiom" : "ipad",
6080
"size" : "76x76",
6181
"scale" : "2x"
82+
},
83+
{
84+
"idiom" : "ipad",
85+
"size" : "83.5x83.5",
86+
"scale" : "2x"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"size" : "1024x1024",
91+
"scale" : "1x"
6292
}
6393
],
6494
"info" : {

‎SwiftWeather/Assets.xcassets/share.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "share.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎SwiftWeather/Assets.xcassets/share.imageset/share.png‎

865 Bytes
Loading

0 commit comments

Comments
 (0)