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.

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

add credits for third party libraries #299

Merged
merged 4 commits into from
Aug 24, 2018
Merged

Conversation

thomaszurkan-optimizely
Copy link
Contributor

No description provided.

@thomaszurkan-optimizely
Copy link
Contributor Author

build

Copy link
Contributor

@mikeproeng37 mikeproeng37 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you include a line about first party code and move the 3rd party deps to Additional Code

https://github.com/optimizely/java-sdk/pull/204/files#diff-04c6e90faac2675aa89e2176d2eec7d8R95

Copy link
Contributor

@mikeproeng37 mikeproeng37 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one last thing and we're good to go

README.md Outdated
@@ -114,3 +114,32 @@ If you choose to build the universal framework yourself, you can do so by runnin
### Contributing
Please see [CONTRIBUTING](CONTRIBUTING.md).

### Credits

First-party code (under OptimizelySDKCore/, OptimizelySDKDatafileManager/, OptimizelySDKEventDispatcher/, OptimizelySDKiOS/, OptimizelySDKShared/, OptimizelySDKTVOS/, OptimizelySDKUniversal/, OptimizelySDKUserProfile/, OptimizelySDKUserProfileService/, ) is copyright Optimizely, Inc. and contributors, licensed under Apache 2.0.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We no longer have code under OptimizelySDKUserProfile. I think we deprecated that in favor of OptimizelySDKUserProfileService

Copy link
Contributor

@mikeproeng37 mikeproeng37 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@spencerwilson-optimizely

Can this be merged?

@thomaszurkan-optimizely thomaszurkan-optimizely merged commit 2f916d2 into master Aug 24, 2018
@spencerwilson-optimizely spencerwilson-optimizely deleted the fix/credits branch August 24, 2018 18:08
AbdurRafay pushed a commit that referenced this pull request Sep 10, 2018
* master:
  this runs through the background and removes any experiments that are… (#302)
  Updating libraries based on SourceClear recommendation (#304)
  add credits for third party libraries (#299)

# Conflicts:
#	OptimizelySDKUniversal/generated-frameworks/Release-iOS-universal-SDK/OptimizelySDKiOS.framework.zip
#	OptimizelySDKUniversal/generated-frameworks/Release-iOS-universal-SDK/OptimizelySDKiOS.framework/OptimizelySDKiOS
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants