Skip to content

Commit

Permalink
Add version 3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
leontobias committed Apr 3, 2024
1 parent cf14e82 commit 2dd1bd9
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 54 deletions.
23 changes: 22 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
## [3.2.0]

### Changed

* [react-native-imglysdk] Updated `@expo/config-plugins` dependency to `7.2`.
* [react-native-photoeditorsdk] Raised minimum PhotoEditor SDK for iOS version to 11.9.0.
* [react-native-photoeditorsdk] Raised minimum PhotoEditor SDK for Android version to 10.9.0. See the [migration guide](https://img.ly/docs/pesdk/react-native/getting-started/migration-guides/3-2-0/) for more information.
* [react-native-videoeditorsdk] Raised minimum VideoEditor SDK for iOS version to 11.9.0.
* [react-native-videoeditorsdk] Raised minimum VideoEditor SDK for Android version to 10.9.0. See the [migration guide](https://img.ly/docs/vesdk/react-native/getting-started/migration-guides/3-2-0/) for more information.

### Added

* [react-native-imglysdk] Added `kspVersion` parameter.
* [react-native-videoeditorsdk] Added `VideoEditorResult` to types export.
* [react-native-photoeditorsdk] Added `PhotoEditorResult` to types export.

### Fixed

* Fixed compiling issues when using native customizations on iOS.
* Fixed potential crash on Android: `IllegalStateException "You need to use a Theme.AppCompat theme (or descendant) with this activity."`.

## [3.1.0]

### Added
Expand Down Expand Up @@ -117,7 +138,7 @@

### Changed

* 🚨 The img.ly maven repository is no longer automatically added to your project by the plugin for Android. Please refer to the new step 3 in the [getting started](https://github.com/imgly/vesdk-react-native#android) section of the README for instructions on how to add it.
* 🚨 The IMG.LY maven repository is no longer automatically added to your project by the plugin for Android. Please refer to the new step 3 in the [getting started](https://github.com/imgly/vesdk-react-native#android) section of the README for instructions on how to add it.
* [react-native-videoeditorsdk] Added support for VideoEditor SDK for Android version 9.
* [react-native-photoeditorsdk] Added support for PhotoEditor SDK for Android version 9.

Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ In order to run any samples or use any wrapper without a watermark,
you'll have to purchase a commercial PhotoEditor SDK or VideoEditor SDK
license. Visit https://img.ly for more details.

Copyright (c) 2014-2023, img.ly GmbH
Copyright (c) 2014-2024, IMG.LY GmbH
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand All @@ -17,7 +17,7 @@ modification, are permitted provided that the following conditions are met:
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

3. Neither the name img.ly GmbH, img.ly, PhotoEditor SDK, VideoEditor SDK
3. Neither the name IMG.LY GmbH, IMG.LY, PhotoEditor SDK, VideoEditor SDK
nor the names of its developers may be used to endorse or promote products
derived from this software without specific prior written permission.

Expand Down
62 changes: 22 additions & 40 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,6 @@ Check out our [video tutorial](https://img.ly/blog/a-photo-and-video-editor-for-

## Getting started

### Known Issues

With version `2.13.0`, we recommend using `compileSdkVersion` not lower than `31` for Android. However, this might interfere with your application's Android Gradle Plugin version if this is set to `4.x`.

If you don't use a newer Android Gradle Plugin version, e.g., by updating at least to RN 0.68.0, you'll most likely encounter a build error similar to:

```
FAILURE: Build failed with an exception.
* What went wrong:
A problem occurred configuring project ':react-native-photoeditorsdk'.
> com.android.builder.errors.EvalIssueException: Installed Build Tools revision 31.0.0 is corrupted. Remove and install again using the SDK Manager.
* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.
* Get more help at https://help.gradle.org
```

As a workaround you can create the following symlinks:

1. Inside `/Users/YOUR-USERNAME/Library/Android/sdk/build-tools/31.0.0/`: Create a `dx` symlink for the `d8` file with `ln -s d8 dx`.
2. From there, go to `./lib/` and create a `dx.jar` symlink for the `d8.jar` file with `ln -s d8.jar dx.jar`.

### Expo CLI

#### Limitations
Expand All @@ -77,7 +53,9 @@ In order to use this module with the Expo CLI you can make use of our integrated
}
```
If needed, you can also use a specific version of our native library for Android as well as define explicitly the included modules. By default, all modules for both PhotoEditor SDK and VideoEditor SDK are included. Furthermore, you can configure the `buildToolsVersion`, `minSdkVersion`, `compileSdkVersion`, `targetSdkVersion`, and `kotlinGradlePluginVersion`.
If needed, you can also use a specific version of our native library for Android as well as define explicitly the included modules. By default, all modules for both PhotoEditor SDK and VideoEditor SDK are included. Further, you can alternate the KSP version with the `kspVersion` parameter based on the Kotlin version you are using. Please take a look [here](#android) on further details.
s
For Expo version < 45, you can configure the `buildToolsVersion`, `minSdkVersion`, `compileSdkVersion`, `targetSdkVersion`, and `kotlinGradlePluginVersion`. From version 45+ we recommend setting these properties using the `expo-build-properties` config plugin directly.
```json
{
Expand All @@ -86,18 +64,19 @@ In order to use this module with the Expo CLI you can make use of our integrated
"react-native-imglysdk",
{
"android": {
"version": "10.4.1",
"version": "10.9.0",
"kspVersion": "1.8.0-1.0.9",
"modules": [
"ui:core",
"ui:transform",
"ui:filter",
"assets:filter-basic"
],
"buildToolsVersion": "31.0.0",
"buildToolsVersion": "34.0.0",
"minSdkVersion": "21",
"compileSdkVersion": "31",
"targetSdkVersion": "30",
"kotlinGradlePluginVersion": "1.5.32"
"compileSdkVersion": "34",
"targetSdkVersion": "34",
"kotlinGradlePluginVersion": "1.8.0"
}
}
]
Expand Down Expand Up @@ -151,7 +130,7 @@ For older React Native versions autolinking is not available and PhotoEditor SDK

#### Android

1. Add the img.ly repository and plugin by opening the `android/build.gradle` file (**not** `android/app/build.gradle`) and adding these lines at the top:
1. Add the IMG.LY repository and plugin by opening the `android/build.gradle` file (**not** `android/app/build.gradle`) and adding these lines at the top:

```groovy
buildscript {
Expand All @@ -160,13 +139,16 @@ For older React Native versions autolinking is not available and PhotoEditor SDK
maven { url "https://artifactory.img.ly/artifactory/imgly" }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.32"
classpath 'ly.img.android.sdk:plugin:10.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
classpath 'com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.8.0-1.0.9' // KSP version is depending on your Kotlin version.
classpath 'ly.img.android.sdk:plugin:10.9.0'
}
}
```
In order to update PhotoEditor SDK for Android replace the version string `10.4.1` with a [newer release](https://github.com/imgly/pesdk-android-demo/releases).
The KSP version depends on the Kotlin version that you are using. In order to find the correct version, please visit the [official KSP release page](https://github.com/google/ksp/releases?page=1).
In order to update PhotoEditor SDK for Android replace the version string `10.9.0` with a [newer release](https://github.com/imgly/pesdk-android-demo/releases).
2. Still in the `android/build.gradle` file (**not** `android/app/build.gradle`), add these lines at the bottom:
Expand All @@ -178,18 +160,18 @@ For older React Native versions autolinking is not available and PhotoEditor SDK
}
```
3. In the same file, you will need to modify the `minSdkVersion` to at least `21`. We also recommend to update the `buildToolsVersion` to `31.0.0` or higher as well as the `compileSdkVersion` to `31` or higher:
3. In the same file, you will need to modify the `minSdkVersion` to at least `21`. We also recommend to update the `buildToolsVersion` to `34.0.0` or higher as well as the `compileSdkVersion` to `34` or higher but this is not mandatory:
```diff
buildscript {
ext {
- buildToolsVersion = "30.0.2"
+ buildToolsVersion = "31.0.0"
+ buildToolsVersion = "34.0.0"
- minSdkVersion = 19
+ minSdkVersion = 21
- compileSdkVersion = 30
+ compileSdkVersion = 31
targetSdkVersion = 30
- compileSdkVersion = 34
+ compileSdkVersion = 34
targetSdkVersion = 34
}
}
```
Expand All @@ -201,7 +183,7 @@ For older React Native versions autolinking is not available and PhotoEditor SDK
apply plugin: 'kotlin-android'
// Comment out the modules you don't need, to save size.
imglyConfig {
IMGLY.configure {
modules {
include 'ui:text'
include 'ui:focus'
Expand Down
2 changes: 1 addition & 1 deletion RNPhotoEditorSDK.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ Pod::Spec.new do |s|

s.dependency 'React'
s.dependency 'React-RCTImage'
s.dependency 'PhotoEditorSDK', '~> 11.8'
s.dependency 'PhotoEditorSDK', '~> 11.9'
end
11 changes: 6 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ apply plugin: 'com.android.library'
// Apply the ImgLy-Plugin
apply plugin: 'ly.img.android.sdk'
apply plugin: 'kotlin-android'
imglyConfig {

IMGLY.configure {
pesdk {
enabled true
}
Expand All @@ -20,7 +21,7 @@ imglyConfig {
}
}

def MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION = "10.4.1"
def MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION = "10.9.0"

task checkVersion {
if (imglyConfig.convertToVersionNumber(imglyConfig.getVersion()) < imglyConfig.convertToVersionNumber(MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION)) {
Expand All @@ -39,12 +40,12 @@ task checkVersion {
preBuild.dependsOn checkVersion

android {
compileSdkVersion safeExtGet('compileSdkVersion', 31)
buildToolsVersion safeExtGet('buildToolsVersion', '31.0.0')
compileSdkVersion safeExtGet('compileSdkVersion', 34)
buildToolsVersion safeExtGet('buildToolsVersion', '34.0.0')

defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', 21)
targetSdkVersion safeExtGet('targetSdkVersion', 30)
targetSdkVersion safeExtGet('targetSdkVersion', 34)
versionCode 1
versionName "1.0"
}
Expand Down
4 changes: 3 additions & 1 deletion android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
android:exported="false"
android:enabled="false"
android:name="ly.img.android.IMGLYAutoInit" />
<activity android:name=".RNPhotoEditorSDKActivity" />
<activity
android:theme="@style/Theme.Imgly"
android:name=".RNPhotoEditorSDKActivity" />
</application>
</manifest>

2 changes: 1 addition & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,5 @@ declare class PhotoEditorModal extends Component<
> {}

export * from "./configuration";
export { PESDK, PhotoEditorModal };
export { PESDK, PhotoEditorModal, PhotoEditorResult };

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "react-native-photoeditorsdk",
"title": "React Native module for PhotoEditor SDK",
"version": "3.1.0",
"version": "3.2.0",
"description": "A React Native module for PhotoEditor SDK. Integrate the photo editor into your own HTML5, iOS or Android app - in minutes!",
"main": "index.js",
"typings": "index.d.ts",
Expand All @@ -28,7 +28,7 @@
"android"
],
"author": {
"name": "img.ly GmbH",
"name": "IMG.LY GmbH",
"email": "[email protected]"
},
"license": "BSD-3-Clause",
Expand All @@ -38,6 +38,6 @@
"react-native": ">=0.60.0 <1.0.x"
},
"dependencies": {
"react-native-imglysdk": "3.1.0"
"react-native-imglysdk": "3.2.0"
}
}

0 comments on commit 2dd1bd9

Please sign in to comment.