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

Copy changes from 0.15.2 to master #1041

Closed
wants to merge 13 commits into from
Closed

Copy changes from 0.15.2 to master #1041

wants to merge 13 commits into from

Conversation

radetsky
Copy link
Contributor

@radetsky radetsky commented Dec 7, 2023

I did cherry-picks from 0.15.2 to master.

Checklist

  • Change is covered by automated tests

radetsky and others added 11 commits December 7, 2023 15:26
* update Package.swift

* update Cartfile

* update Cartfile.resolved

* themis.podspec: spec new dependency

* set 0.15.1 version in xcodeproj

* update versions in Package.swift and themis.podspec

* fix projects settings

* update changelog

* set 0.15.1 version in examples

* disable bitcode in project

* update podspec

* increase iOS version in Objc Tests Podfile
* gradle 7.6.1, targetSdkVersion 31, build-tools 34, ndk 26

* AndroidManifest: 0.15.2

* return to NDK 25. Assemble with NDK26 was failed

* build.gradle - set version 0.15.2
* Update iOS and Android settings

* Update minimum iOS to 12.4 because React-Native requires 12.4

* Update CHANGELOG.md

Co-authored-by: vixentael <[email protected]>

---------

Co-authored-by: vixentael <[email protected]>
* android examples: upgrade gradlew

* android examples: upgrade gradle plugin

* increase versions of other tools

* README for android example
* new java project, but old source code

* update self tests for the example app

* fix test workflow, fix Makefile
* iOS-Carthage

* iOS-Cocoapods

* iOS-SPM

* macOS-Carthage

* macOS-SPM

* swift_iOS-Carthage

* swift_iOS-Cocoapods

* swift_iOS-SPM

* swift_macOS-Carthage

* swift_macOS-SPM
* Update the example for react-native

* Update the second example for react-native
* exports

* Add TypeScript declaration file (index.d.ts)

* Add example for TypeScript

* Add flow for NodeJS with Typescript example

* CHANGELOG.md updated

* added import_module.mjs and test

* downgrade typescript to 4.4 to be compatible with node 12

* update workflow
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
Copy link
Collaborator

Choose a reason for hiding this comment

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

can we use gradlew version for android the same as for java (8.0.2)?

github "cossacklabs/themis" "0.15.1"
Copy link
Collaborator

Choose a reason for hiding this comment

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

0.15.1 or 0.15.2?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Apple-related wrappers have version 0.15.1
Would you recommend increasing all package versions to 0.15.2 without any changes?

*/
react {
/* Folders */
// The root of your project, i.e. where "package.json" lives. Default is '..'
Copy link
Collaborator

Choose a reason for hiding this comment

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

it's our comments or generated by some tool?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's generated.

@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
Copy link
Collaborator

Choose a reason for hiding this comment

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

third version of gradlew

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I configured and tested all examples versions of gradle to 8.0.2

@radetsky radetsky closed this Apr 29, 2024
@radetsky radetsky deleted the rad/0.15.2-to-master branch April 29, 2024 15:07
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.

2 participants