Skip to content

Commit

Permalink
godeps update (#65)
Browse files Browse the repository at this point in the history
  • Loading branch information
godrei committed Jun 8, 2017
1 parent 5e0014f commit d8ea1e6
Show file tree
Hide file tree
Showing 47 changed files with 3,020 additions and 1,994 deletions.
5 changes: 2 additions & 3 deletions .gitignore
@@ -1,4 +1,3 @@
.bitrise.secrets.yml
.bitrise
out/
_tmp
.gows*
.bitrise*
44 changes: 28 additions & 16 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions gows.yml
@@ -0,0 +1 @@
package_name: github.com/bitrise-io/steps-xcode-archive
15 changes: 8 additions & 7 deletions main.go
Expand Up @@ -472,25 +472,26 @@ is available in the $BITRISE_XCODE_RAW_RESULT_TEXT_PATH environment variable`)
under the Products/Applications folder
*/

embeddedProfilePth, err := xcarchive.EmbeddedMobileProvisionPth(tmpArchivePath)
embeddedProfilePth, err := xcarchive.FindEmbeddedMobileProvision(tmpArchivePath)
if err != nil {
fail("Failed to get embedded profile path, error: %s", err)
}

provProfile, err := provisioningprofile.NewFromFile(embeddedProfilePth)
provProfilePlistData, err := provisioningprofile.NewPlistDataFromFile(embeddedProfilePth)
if err != nil {
fail("Failed to create provisioning profile model, error: %s", err)
}

if provProfile.Name == nil {
name, found := provProfilePlistData.GetString("Name")
if !found {
fail("Profile name empty")
}

legacyExportCmd := xcodebuild.NewLegacyExportCommand()
legacyExportCmd.SetExportFormat("ipa")
legacyExportCmd.SetArchivePath(tmpArchivePath)
legacyExportCmd.SetExportPath(ipaPath)
legacyExportCmd.SetExportProvisioningProfileName(*provProfile.Name)
legacyExportCmd.SetExportProvisioningProfileName(name)

if configs.OutputTool == "xcpretty" {
xcprettyCmd := xcpretty.New(legacyExportCmd)
Expand Down Expand Up @@ -534,17 +535,17 @@ is available in the $BITRISE_XCODE_RAW_RESULT_TEXT_PATH environment variable`)
if configs.ExportMethod == "auto-detect" {
log.Printf("auto-detect export method, based on embedded profile")

embeddedProfilePth, err := xcarchive.EmbeddedMobileProvisionPth(tmpArchivePath)
embeddedProfilePth, err := xcarchive.FindEmbeddedMobileProvision(tmpArchivePath)
if err != nil {
fail("Failed to get embedded profile path, error: %s", err)
}

provProfile, err := provisioningprofile.NewFromFile(embeddedProfilePth)
provProfilePlistData, err := provisioningprofile.NewPlistDataFromFile(embeddedProfilePth)
if err != nil {
fail("Failed to create provisioning profile model, error: %s", err)
}

method = provProfile.GetExportMethod()
method = provisioningprofile.GetExportMethod(provProfilePlistData)
log.Printf("detected export method: %s", method)
} else {
log.Printf("using export-method input: %s", configs.ExportMethod)
Expand Down
3 changes: 0 additions & 3 deletions step.yml
Expand Up @@ -24,9 +24,6 @@ deps:
- name: xcode
brew:
- name: go
apt_get:
- name: golang
bin_name: go
toolkit:
go:
package_name: github.com/bitrise-io/steps-xcode-archive
Expand Down

0 comments on commit d8ea1e6

Please sign in to comment.