Skip to content

Commit a5835cf

Browse files
authored
Merge branch 'juicycleff:master' into wasm-v2
2 parents 04c8d5e + 3461942 commit a5835cf

24 files changed

+32
-1036
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
## Pending (master branch only)
1+
## 2022.2.2 (master branch only)
22
* [Android] Fix touch detection when using Unity's New Input System. [#938](https://github.com/juicycleff/flutter-unity-view-widget/pull/938)
33
* [Android] Workaround for mUnityplayer error in Unity plugins using the AndroidJavaProxy. [#908](https://github.com/juicycleff/flutter-unity-view-widget/pull/908)
44
* [Android] Add namespace for Android gradle plugin (AGP) 8 compatibility.
55
* [Android] Fix kotlin compilation error with Flutter 3.24 and newer. [#973](https://github.com/juicycleff/flutter-unity-view-widget/issues/973)
6+
* [Android] Update documentation for new `.gradle.kts` files.
7+
* [Android] Update some ancient build.gradle values to match Unity 2022.3. Like CompileSdk to 34 and Java to 11.
8+
* [iOS] Add an empty privacy manifest.
9+
* [Web] Don't crash on unknown event data from Unity.
10+
* Disable windows support in `pubspec.yaml` to avoid confusion. Windows support was never completed.
611

712
## 2022.2.1
813

README.md

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313

1414
Flutter unity 3D widget for embedding unity in flutter. Now you can make awesome gamified features of your app in Unity and get it rendered in a Flutter app both in fullscreen and embeddable mode. Works great on `Android, iPad OS, iOS, Web`.
1515

16-
Windows support is a work in progress.
1716
<br />
17+
1818
### Notes
1919
- Use Windows or Mac to export and build your project.
2020
Users on Ubuntu have reported a lot of errors in the Unity export.
2121
- Emulator support is limited and requires special setup. Please use a physical device for Android and iOS.
22-
- Supports Unity 2019.4.3 or later, we recommend the latest LTS.
23-
- Use only OpenGLES3 as Graphics API on Android for AR compatibility.
24-
22+
- Supports Unity 2019.4.3 up to 2022.3.x, we recommend the latest 2022.3 LTS.
23+
Check [this github issue](https://github.com/juicycleff/flutter-unity-view-widget/issues/967) for support of Unity 6.
24+
- Use only OpenGLES3 as Graphics API on Android for AR compatibility.
25+
- Windows isn't supported because of the lack of [Flutter PlatformView support](https://github.com/flutter/flutter/issues/31713).
2526

2627
## Notice
2728
Need me to respond, tag me [Rex Isaac Raphael](https://github.com/juicycleff).
@@ -31,22 +32,14 @@ This plugin expects you to atleast know how to use Unity Engine. If you have iss
3132
Moving forward, versioning of the package will change to match unity releases after proper test. Mind you this does not mean the package
3233
is not compatible with other versions, it just mean it's been tested to work with a unity version.
3334

34-
Windows coming soon.
35-
3635
## Installation
3736

38-
First depend on the library by adding this to your packages `pubspec.yaml`:
39-
- Flutter 3.0.0
40-
```yaml
41-
dependencies:
42-
flutter_unity_widget: ^2022.2.0
43-
```
37+
This plugin requires Flutter >= 3.3.0
4438

45-
46-
- Pre Flutter 3.0.0 (This version will gradually be deprecated)
39+
First depend on the library by adding this to your packages `pubspec.yaml`:
4740
```yaml
4841
dependencies:
49-
flutter_unity_widget: ^2022.1.0+7
42+
flutter_unity_widget: ^2022.2.1 # use the latest compatible version
5043
```
5144
5245
Now inside your Dart code you can import it.
@@ -331,7 +324,10 @@ allprojects {
331324

332325
<details>
333326
<summary>:information_source: <b>iOS</b></summary>
334-
327+
328+
> Because of Apple's privacy manifest requirements, you need a minimal Unity version of 2021.3.35 or 2022.3.18 to publish an app.
329+
330+
335331
1. Open the *ios/Runner.xcworkspace* (workspace, not the project) file in Xcode, right-click on the Navigator (not on an item), go to **Add Files to "Runner"** and add
336332
the *ios/UnityLibrary/Unity-Iphone.xcodeproj* file.
337333

android/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
group 'com.xraph.plugin.flutter_unity_widget'
2-
version '4.0-SNAPSHOT'
2+
version '2022.2.2-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.6.20'
5+
ext.kotlin_version = '1.8.10'
66
repositories {
77
google()
88
mavenCentral()
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:4.1.0'
12+
classpath 'com.android.tools.build:gradle:7.4.2'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
1515
}
@@ -33,7 +33,7 @@ apply plugin: 'com.android.library'
3333
apply plugin: 'kotlin-android'
3434

3535
android {
36-
compileSdkVersion 29
36+
compileSdkVersion 34
3737

3838
// backwards compatible for old gradle versions without namespace
3939
if (project.android.hasProperty("namespace")) {
@@ -51,12 +51,12 @@ android {
5151
}
5252

5353
compileOptions {
54-
sourceCompatibility JavaVersion.VERSION_1_8
55-
targetCompatibility JavaVersion.VERSION_1_8
54+
sourceCompatibility JavaVersion.VERSION_11
55+
targetCompatibility JavaVersion.VERSION_11
5656
}
5757

5858
kotlinOptions {
59-
jvmTarget = JavaVersion.VERSION_1_8
59+
jvmTarget = JavaVersion.VERSION_11.toString()
6060
}
6161
}
6262

example/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ android {
1212
// ndkVersion = flutter.ndkVersion
1313

1414
compileOptions {
15-
sourceCompatibility = JavaVersion.VERSION_1_8
16-
targetCompatibility = JavaVersion.VERSION_1_8
15+
sourceCompatibility = JavaVersion.VERSION_11
16+
targetCompatibility = JavaVersion.VERSION_11
1717
}
1818

1919
kotlinOptions {
2020
// if you change this value, also change it in android/build.gradle subprojects{}
21-
jvmTarget = JavaVersion.VERSION_1_8
21+
jvmTarget = JavaVersion.VERSION_11.toString()
2222
}
2323

2424
defaultConfig {

example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ subprojects {
3434
}
3535
project.android.kotlinOptions {
3636
// if you change this value, also change it in android/app/build.gradle
37-
jvmTarget = JavaVersion.VERSION_1_8
37+
jvmTarget = JavaVersion.VERSION_11.toString()
3838
}
3939
}
4040
}

example/windows/.gitignore

Lines changed: 0 additions & 17 deletions
This file was deleted.

example/windows/CMakeLists.txt

Lines changed: 0 additions & 95 deletions
This file was deleted.

example/windows/flutter/CMakeLists.txt

Lines changed: 0 additions & 103 deletions
This file was deleted.

example/windows/flutter/generated_plugin_registrant.cc

Lines changed: 0 additions & 14 deletions
This file was deleted.

example/windows/flutter/generated_plugin_registrant.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)