Skip to content
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

Merge OneTimePassword 2.1 release into Swift 3 development #113

Merged
merged 5 commits into from
Nov 19, 2016
Merged

Merge OneTimePassword 2.1 release into Swift 3 development #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eff355f
Add logging to the Xcode path injection script
mattrubin Nov 16, 2016
5ce9a8f
Bump the copyright year in KeychainTests.swift
mattrubin Nov 16, 2016
dcbd9df
Add the 2.1 release date to the changelog
mattrubin Nov 16, 2016
679a52a
Merge pull request #112 from mattrubin/release-changes
mattrubin Nov 16, 2016
f6df3bb
Merge pull request #102 from mattrubin/develop
mattrubin Nov 17, 2016
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!--## [In development][master]-->

## [2.1][]
## [2.1][] (2016-11-16)
#### Enhancements
- Add watchOS support. ([#96](https://github.com/mattrubin/OneTimePassword/pull/96), [#98](https://github.com/mattrubin/OneTimePassword/pull/98), [#107](https://github.com/mattrubin/OneTimePassword/pull/107))
- Inject Xcode path into the CommonCrypto modulemaps, to support non-standard Xcode locations. ([#92](https://github.com/mattrubin/OneTimePassword/pull/92), [#101](https://github.com/mattrubin/OneTimePassword/pull/101))
Expand Down
4 changes: 3 additions & 1 deletion CommonCrypto/injectXcodePath.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,16 @@ absPath() {
}

scriptDir="`dirname $0`"
scriptName="`basename $0`"
absScriptDir="`cd $scriptDir; pwd`"

main() {
echo " ...in ${absScriptDir}..."
for f in `find ${absScriptDir} -name module.modulemap`; do
echo " ...updating file ${f}"
cat ${f} | sed "s,${defaultXcodePath},${realXcodePath},g" > ${f}.new || fatal "Failed to update modulemap ${f}"
mv ${f}.new ${f} || fatal "Failed to replace modulemap ${f}"
done
echo " ...with new path `xcode-select -p`"
}

main $*
2 changes: 1 addition & 1 deletion Tests/KeychainTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// KeychainTests.swift
// OneTimePassword
//
// Copyright (c) 2013-2015 Matt Rubin and the OneTimePassword authors
// Copyright (c) 2013-2016 Matt Rubin and the OneTimePassword authors
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down