Skip to content

Commit eb773bc

Browse files
timbotimbotimbotimbo
committed
Merge branch 'master' into experimental/unity_6000.
2 parents 38b44b8 + 24309be commit eb773bc

40 files changed

+188
-5159
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.unitypackage binary

‎example/unity/DemoApp/.gitignore‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# This .gitignore file should be placed at the root of your Unity project directory
2+
#
3+
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
4+
#
5+
.utmp/
6+
/[Ll]ibrary/
7+
/[Tt]emp/
8+
/[Oo]bj/
9+
/[Bb]uild/
10+
/[Bb]uilds/
11+
/[Ll]ogs/
12+
/[Uu]ser[Ss]ettings/
13+
*.log
14+
15+
# By default unity supports Blender asset imports, *.blend1 blender files do not need to be commited to version control.
16+
*.blend1
17+
*.blend1.meta
18+
19+
# MemoryCaptures can get excessive in size.
20+
# They also could contain extremely sensitive data
21+
/[Mm]emoryCaptures/
22+
23+
# Recordings can get excessive in size
24+
/[Rr]ecordings/
25+
26+
# Uncomment this line if you wish to ignore the asset store tools plugin
27+
# /[Aa]ssets/AssetStoreTools*
28+
29+
# Autogenerated Jetbrains Rider plugin
30+
/[Aa]ssets/Plugins/Editor/JetBrains*
31+
# Jetbrains Rider personal-layer settings
32+
*.DotSettings.user
33+
34+
# Visual Studio cache directory
35+
.vs/
36+
37+
# Gradle cache directory
38+
.gradle/
39+
40+
# Autogenerated VS/MD/Consulo solution and project files
41+
ExportedObj/
42+
.consulo/
43+
*.csproj
44+
*.unityproj
45+
*.sln
46+
*.suo
47+
*.tmp
48+
*.user
49+
*.userprefs
50+
*.pidb
51+
*.booproj
52+
*.svd
53+
*.pdb
54+
*.mdb
55+
*.opendb
56+
*.VC.db
57+
58+
# Unity3D generated meta files
59+
*.pidb.meta
60+
*.pdb.meta
61+
*.mdb.meta
62+
63+
# Unity3D generated file on crash reports
64+
sysinfo.txt
65+
66+
# Mono auto generated files
67+
mono_crash.*
68+
69+
# Builds
70+
*.apk
71+
*.aab
72+
*.unitypackage
73+
*.unitypackage.meta
74+
*.app
75+
76+
# Crashlytics generated file
77+
crashlytics-build.properties
78+
79+
# TestRunner generated files
80+
InitTestScene*.unity*
81+
82+
# Addressables default ignores, before user customizations
83+
/ServerData
84+
/[Aa]ssets/StreamingAssets/aa*
85+
/[Aa]ssets/AddressableAssetsData/link.xml*
86+
/[Aa]ssets/Addressables_Temp*
87+
# By default, Addressables content builds will generate addressables_content_state.bin
88+
# files in platform-specific subfolders, for example:
89+
# /Assets/AddressableAssetsData/OSX/addressables_content_state.bin
90+
/[Aa]ssets/AddressableAssetsData/*/*.bin*
91+
92+
# Visual Scripting auto-generated files
93+
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db
94+
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta
95+
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers
96+
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta
97+
98+
# Auto-generated scenes by play mode tests
99+
/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity*

‎example/unity/DemoApp/Assembly-CSharp-Editor.csproj‎

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

‎example/unity/DemoApp/Assembly-CSharp.csproj‎

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

‎example/unity/DemoApp/Assets/FlutterUnityIntegration/Editor/Build.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,8 @@ private static void SetupAndroidProjectKotlin()
653653
File.WriteAllText(projBuildPath, projBuildScript);
654654
}
655655

656-
// Sets up the project settings.gradle files correctly
657-
if (!Regex.IsMatch(settingsScript, @"include("":unityLibrary"")"))
656+
// Sets up the project settings.gradle.kts files correctly
657+
if (!Regex.IsMatch(settingsScript, @"include\("":unityLibrary""\)"))
658658
{
659659
settingsScript += @"
660660
@@ -665,7 +665,7 @@ private static void SetupAndroidProjectKotlin()
665665
}
666666

667667

668-
// Sets up the project app build.gradle files correctly
668+
// Sets up the project app build.gradle.kts files correctly
669669
if (!Regex.IsMatch(appBuildScript, @"dependencies \{"))
670670
{
671671
appBuildScript += @"

‎example/unity/DemoApp/Assets/FlutterUnityIntegration/README.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
Visit https://github.com/juicycleff/flutter-unity-view-widget
44

5-
unitypackage version: fuw-2022.3.0
5+
unitypackage version: fuw-6000.0.2

‎example/unity/DemoApp/Demo App.sln‎

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

‎example/unity/DemoApp/DemoApp.sln‎

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

‎example/unity/DemoApp/Packages/manifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": "2.0.3",
3+
"com.unity.collab-proxy": "2.7.1",
44
"com.unity.ext.nunit": "1.0.6",
5-
"com.unity.ide.rider": "3.0.15",
6-
"com.unity.ide.visualstudio": "2.0.16",
5+
"com.unity.ide.rider": "3.0.36",
6+
"com.unity.ide.visualstudio": "2.0.23",
77
"com.unity.ide.vscode": "1.2.5",
8-
"com.unity.test-framework": "1.1.31",
9-
"com.unity.textmeshpro": "3.0.6",
10-
"com.unity.timeline": "1.7.1",
8+
"com.unity.test-framework": "1.1.33",
9+
"com.unity.textmeshpro": "3.0.9",
10+
"com.unity.timeline": "1.7.7",
1111
"com.unity.ugui": "1.0.0",
1212
"com.unity.modules.ai": "1.0.0",
1313
"com.unity.modules.androidjni": "1.0.0",

‎example/unity/DemoApp/Packages/packages-lock.json‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"com.unity.collab-proxy": {
4-
"version": "2.0.3",
4+
"version": "2.7.1",
55
"depth": 0,
66
"source": "registry",
77
"dependencies": {},
@@ -15,7 +15,7 @@
1515
"url": "https://packages.unity.com"
1616
},
1717
"com.unity.ide.rider": {
18-
"version": "3.0.15",
18+
"version": "3.0.36",
1919
"depth": 0,
2020
"source": "registry",
2121
"dependencies": {
@@ -24,7 +24,7 @@
2424
"url": "https://packages.unity.com"
2525
},
2626
"com.unity.ide.visualstudio": {
27-
"version": "2.0.16",
27+
"version": "2.0.23",
2828
"depth": 0,
2929
"source": "registry",
3030
"dependencies": {
@@ -40,7 +40,7 @@
4040
"url": "https://packages.unity.com"
4141
},
4242
"com.unity.test-framework": {
43-
"version": "1.1.31",
43+
"version": "1.1.33",
4444
"depth": 0,
4545
"source": "registry",
4646
"dependencies": {
@@ -51,7 +51,7 @@
5151
"url": "https://packages.unity.com"
5252
},
5353
"com.unity.textmeshpro": {
54-
"version": "3.0.6",
54+
"version": "3.0.9",
5555
"depth": 0,
5656
"source": "registry",
5757
"dependencies": {
@@ -60,13 +60,13 @@
6060
"url": "https://packages.unity.com"
6161
},
6262
"com.unity.timeline": {
63-
"version": "1.7.1",
63+
"version": "1.7.7",
6464
"depth": 0,
6565
"source": "registry",
6666
"dependencies": {
67+
"com.unity.modules.audio": "1.0.0",
6768
"com.unity.modules.director": "1.0.0",
6869
"com.unity.modules.animation": "1.0.0",
69-
"com.unity.modules.audio": "1.0.0",
7070
"com.unity.modules.particlesystem": "1.0.0"
7171
},
7272
"url": "https://packages.unity.com"
@@ -212,17 +212,6 @@
212212
"version": "1.0.0",
213213
"depth": 0,
214214
"source": "builtin",
215-
"dependencies": {
216-
"com.unity.modules.ui": "1.0.0",
217-
"com.unity.modules.imgui": "1.0.0",
218-
"com.unity.modules.jsonserialize": "1.0.0",
219-
"com.unity.modules.uielementsnative": "1.0.0"
220-
}
221-
},
222-
"com.unity.modules.uielementsnative": {
223-
"version": "1.0.0",
224-
"depth": 1,
225-
"source": "builtin",
226215
"dependencies": {
227216
"com.unity.modules.ui": "1.0.0",
228217
"com.unity.modules.imgui": "1.0.0",

0 commit comments

Comments
 (0)