Skip to content
This repository has been archived by the owner on Aug 14, 2022. It is now read-only.

Commit

Permalink
RC 1.0.15
Browse files Browse the repository at this point in the history
  • Loading branch information
vgorloff committed Sep 17, 2021
1 parent 2363d45 commit 9ed07f0
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.0.15] - 2021-09-17
* Gradle and Android Studio compatibility upgrade.

## [1.0.14] - 2021-05-12
* Updated to use Swift 5.4.

Expand Down
18 changes: 9 additions & 9 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@

- macOS 11.x
- Xcode 12.x
- Android Studio 4.1.3
- Android Studio 2020.3.x

## Usage

1. Make sure that you have [Swift Android Toolchain](https://github.com/vgorloff/swift-everywhere-toolchain). You can either build it or download [pre-build](https://github.com/vgorloff/swift-everywhere-toolchain/releases) version.

2. Reveal the NDK version inside file `NDK_VERSION`, which located at the root of the Swift Toolchain you downloaded or built on step 1.

2. Make sure that you have a symlink at `/usr/local/ndk/$NDK_VERSION` to appropriate NDK bundle. Where `$NDK_VERSION` is the NDK version from file `NDK_VERSION` you viewed on step 2.
3. Make sure that you have a symlink at `/usr/local/ndk/$NDK_VERSION` to appropriate NDK bundle. Where `$NDK_VERSION` is the NDK version from file `NDK_VERSION` you viewed on step 2.

```sh
sudo mkdir -p /usr/local/ndk
sudo ln -vsi ~/Library/Android/sdk/ndk/21.X.YYYZZZ /usr/local/ndk/21.X.YYYZZZ
```

3. Make sure that NDK version defined in Gradle build configuration file (See: `Android/app/build.gradle`) in property `android.ndkVersion` matches NDK version from file you viewed on step 2. Update property `android.ndkVersion` if needed.

4. Copy file `example.swiftToolchain.rc` to `swiftToolchain.rc`. Update file `swiftToolchain.rc` with proper paths:
4. Make sure that NDK version defined in Gradle build configuration file (See: `Android/app/build.gradle`) in property `android.ndkVersion` matches NDK version from file you viewed on step 2. Update property `android.ndkVersion` if needed.

5. Copy file `example.swiftToolchain.rc` to `swiftToolchain.rc`. Update file `swiftToolchain.rc` with proper paths:

- `SaSwiftToolchainDirPath` - Path to Swift Toolchain you downloaded or built on step 1.

5. Install "Protocol buffers" for Java and Swift sources generation `brew install protobuf swift-protobuf`
6. Install "Protocol buffers" for Java and Swift sources generation `brew install protobuf swift-protobuf`

6. (Optional) Generate models: `Scripts/GenerateModels.sh`
7. (Optional) Generate models: `Scripts/GenerateModels.sh`

7. Open `iOS/HelloJNI.xcodeproj` in Xcode and run it on Device or iOS Simulator.
8. Open `iOS/HelloJNI.xcodeproj` in Xcode and run it on Device or iOS Simulator.

8. Open folder `Android` in Android Studio and run it on Device or Android Simulator.
9. Open folder `Android` in Android Studio and run it on Device or Android Simulator.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.14
1.0.15

0 comments on commit 9ed07f0

Please sign in to comment.