From e50f0d838e1bc1998df188c17890b1538940ebb1 Mon Sep 17 00:00:00 2001 From: Laszlo Pusok Date: Thu, 24 Feb 2022 17:08:49 +0100 Subject: [PATCH] Update filedownloader package --- gitclone/checkout_method_pr_auto_diff.go | 2 +- go.mod | 1 - go.sum | 6 ------ .../filedownloader/filedownloader.go | 0 .../bitrise-step-export-universal-apk/LICENSE | 21 ------------------- vendor/modules.txt | 4 +--- 6 files changed, 2 insertions(+), 32 deletions(-) rename vendor/github.com/{bitrise-steplib/bitrise-step-export-universal-apk => bitrise-io/go-utils}/filedownloader/filedownloader.go (100%) delete mode 100644 vendor/github.com/bitrise-steplib/bitrise-step-export-universal-apk/LICENSE diff --git a/gitclone/checkout_method_pr_auto_diff.go b/gitclone/checkout_method_pr_auto_diff.go index fc2089df..cf8870c1 100644 --- a/gitclone/checkout_method_pr_auto_diff.go +++ b/gitclone/checkout_method_pr_auto_diff.go @@ -9,8 +9,8 @@ import ( "github.com/bitrise-io/go-steputils/input" "github.com/bitrise-io/go-utils/command/git" + "github.com/bitrise-io/go-utils/filedownloader" "github.com/bitrise-io/go-utils/log" - "github.com/bitrise-steplib/bitrise-step-export-universal-apk/filedownloader" ) // diff --git a/go.mod b/go.mod index 37f63047..44856597 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/bitrise-io/envman v0.0.0-20210517135508-b2b4fe89eac5 github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77 github.com/bitrise-io/go-utils v0.0.0-20210713111255-08be784d45d0 - github.com/bitrise-steplib/bitrise-step-export-universal-apk v0.0.0-20210505160226-751d4bb4627c github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.0 // indirect github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index c8581089..39a32d10 100644 --- a/go.sum +++ b/go.sum @@ -8,15 +8,12 @@ github.com/bitrise-io/envman v0.0.0-20200512105748-919e33f391ee/go.mod h1:m8pTp1 github.com/bitrise-io/envman v0.0.0-20210517135508-b2b4fe89eac5 h1:3jVXjsejV+1EW9Sp7ef+sMinD0J3HFsPgh4Du6ctqZc= github.com/bitrise-io/envman v0.0.0-20210517135508-b2b4fe89eac5/go.mod h1:m8pTp1o3Sw9uzDxb1WRm5IBRnMau2iOvPMSnRCAhQNI= github.com/bitrise-io/go-plist v0.0.0-20210301100253-4b1a112ccd10/go.mod h1:pARutiL3kEuRLV3JvswidvfCj+9Y3qMZtji2BDqLFsA= -github.com/bitrise-io/go-steputils v0.0.0-20210505101226-8536c460c5c1/go.mod h1:gF9UfXaXyxkKLAKgo+RpZFsRemnTv6wAPTljpJXoxI8= github.com/bitrise-io/go-steputils v0.0.0-20210507072936-92fde382fb33/go.mod h1:YCtb1VETn/rF9tCt9oInhd/cwbt1ETPm+dTlDIfyD+A= github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77 h1:+wd+ADdtJCRL9JEghE1RMbR4ywXBYNvIBelAW/UkWr8= github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77/go.mod h1:H0iZjgsAR5NA6pnlD/zKB6AbxEsskq55pwJ9klVmP8w= github.com/bitrise-io/go-utils v0.0.0-20201019131314-6cc2aa4d248a/go.mod h1:tTEsKvbz1LbzuN/KpVFHXnLtcAPdEgIdM41s0lL407s= -github.com/bitrise-io/go-utils v0.0.0-20210323091856-00429d8e1e87/go.mod h1:tTEsKvbz1LbzuN/KpVFHXnLtcAPdEgIdM41s0lL407s= github.com/bitrise-io/go-utils v0.0.0-20210505091801-98b7dc39ee61/go.mod h1:nhdaDQFvaMny1CugVV6KjK92/q97ENo0RuKSW5I4fbA= github.com/bitrise-io/go-utils v0.0.0-20210505121718-07411d72e36e/go.mod h1:nhdaDQFvaMny1CugVV6KjK92/q97ENo0RuKSW5I4fbA= -github.com/bitrise-io/go-utils v0.0.0-20210505130606-6269c7fd64f3/go.mod h1:nhdaDQFvaMny1CugVV6KjK92/q97ENo0RuKSW5I4fbA= github.com/bitrise-io/go-utils v0.0.0-20210506064210-b22e2b7b3ad3/go.mod h1:nhdaDQFvaMny1CugVV6KjK92/q97ENo0RuKSW5I4fbA= github.com/bitrise-io/go-utils v0.0.0-20210507100250-37de47dfa6ce/go.mod h1:15EZZf02noI5nWFqXMZEoyb1CyqYRXTMz5Fyu4CWFzI= github.com/bitrise-io/go-utils v0.0.0-20210514083430-4d1fb0330dfe/go.mod h1:DRx7oFuAqk0dbKpAKCqWl0TgrowfJUb/MqYPRscxJOQ= @@ -32,9 +29,6 @@ github.com/bitrise-io/stepman v0.0.0-20210505110307-5c2296bcc558/go.mod h1:WLh58 github.com/bitrise-io/stepman v0.0.0-20210517135458-203f7a48d37a/go.mod h1:WLh58JYBgbD1Z/yyw1AkFz/90F6oBL0HS/luBpUW9dI= github.com/bitrise-io/xcode-project v0.0.0-20201203153351-7ad13a1dd021/go.mod h1:R2iDrjJlNQtVwIdXT+F9bcx/YTNJPdd0tXfFRJsxHaM= github.com/bitrise-io/xcode-project v0.0.0-20210302080829-f3e0bfbcd5cb/go.mod h1:t9Gj5Pe/FBDTUrkFmw2lK6PbzESB6o27eE97ukZj8Rs= -github.com/bitrise-steplib/bitrise-step-export-universal-apk v0.0.0-20210505160226-751d4bb4627c h1:vHSmb/hVIGG48UQfVJBc7G8bGvEUQeq2SpXe5zb7O64= -github.com/bitrise-steplib/bitrise-step-export-universal-apk v0.0.0-20210505160226-751d4bb4627c/go.mod h1:cDoKMWlE09mtRHUTOAmV501PYRkbRFTZkMlVubiy7fA= -github.com/bitrise-steplib/steps-xcode-test v0.0.0-20210504122558-8d13146f093c/go.mod h1:3vjk5RND3jeCH21LVxe9Fdp/BzlLHYD2G2PsiRgtMws= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/vendor/github.com/bitrise-steplib/bitrise-step-export-universal-apk/filedownloader/filedownloader.go b/vendor/github.com/bitrise-io/go-utils/filedownloader/filedownloader.go similarity index 100% rename from vendor/github.com/bitrise-steplib/bitrise-step-export-universal-apk/filedownloader/filedownloader.go rename to vendor/github.com/bitrise-io/go-utils/filedownloader/filedownloader.go diff --git a/vendor/github.com/bitrise-steplib/bitrise-step-export-universal-apk/LICENSE b/vendor/github.com/bitrise-steplib/bitrise-step-export-universal-apk/LICENSE deleted file mode 100644 index 6cecbe9c..00000000 --- a/vendor/github.com/bitrise-steplib/bitrise-step-export-universal-apk/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2020 bitrise - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/vendor/modules.txt b/vendor/modules.txt index da15b462..88ccb1bf 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -17,6 +17,7 @@ github.com/bitrise-io/go-utils/colorstring github.com/bitrise-io/go-utils/command github.com/bitrise-io/go-utils/command/git github.com/bitrise-io/go-utils/errorutil +github.com/bitrise-io/go-utils/filedownloader github.com/bitrise-io/go-utils/fileutil github.com/bitrise-io/go-utils/log github.com/bitrise-io/go-utils/parseutil @@ -26,9 +27,6 @@ github.com/bitrise-io/go-utils/retry github.com/bitrise-io/go-utils/sliceutil # github.com/bitrise-io/goinp v0.0.0-20210504152833-8559b0680ab1 github.com/bitrise-io/goinp/goinp -# github.com/bitrise-steplib/bitrise-step-export-universal-apk v0.0.0-20210505160226-751d4bb4627c -## explicit -github.com/bitrise-steplib/bitrise-step-export-universal-apk/filedownloader # github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew/spew # github.com/hashicorp/go-cleanhttp v0.5.2