Skip to content

Commit da64bda

Browse files
fadi-georgefadi-george
committed
update unity example
1 parent 7d0d7e8 commit da64bda

13 files changed

Lines changed: 1584 additions & 58 deletions

‎OneSignalExample/Assets/Plugins/Android/gradleTemplate.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M
22
org.gradle.parallel=true
3-
unityStreamingAssets=.unity3d**STREAMING_ASSETS**
3+
unityStreamingAssets=**STREAMING_ASSETS**
44
# Android Resolver Properties Start
55
android.useAndroidX=true
66
android.enableJetifier=true

‎OneSignalExample/Assets/Plugins/Android/gradleTemplate.properties.backup‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M
2+
org.gradle.parallel=true
3+
unityStreamingAssets=.unity3d**STREAMING_ASSETS**
4+
# Android Resolver Properties Start
5+
android.useAndroidX=true
6+
android.enableJetifier=true
7+
# Android Resolver Properties End
8+
**ADDITIONAL_PROPERTIES**

‎OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN
22

33
apply plugin: 'com.android.library'
4+
apply from: '../shared/keepUnitySymbols.gradle'
45
**APPLY_PLUGINS**
56

67
dependencies {
@@ -12,7 +13,10 @@ dependencies {
1213

1314
// Android Resolver Exclusions Start
1415
android {
15-
packagingOptions {
16+
namespace "com.unity3d.player"
17+
ndkPath "**NDKPATH**"
18+
ndkVersion "**NDKVERSION**"
19+
packaging {
1620
exclude ('/lib/armeabi/*' + '*')
1721
exclude ('/lib/mips/*' + '*')
1822
exclude ('/lib/mips64/*' + '*')
@@ -22,7 +26,7 @@ android {
2226
}
2327
// Android Resolver Exclusions End
2428
android {
25-
compileSdkVersion **APIVERSION**
29+
compileSdk **APIVERSION**
2630
buildToolsVersion '**BUILDTOOLS**'
2731

2832
compileOptions {
@@ -31,24 +35,26 @@ android {
3135
}
3236

3337
defaultConfig {
34-
minSdkVersion **MINSDKVERSION**
35-
targetSdkVersion **TARGETSDKVERSION**
38+
**DEFAULT_CONFIG_SETUP**
39+
minSdk **MINSDK**
40+
targetSdk **TARGETSDK**
3641
ndk {
42+
debugSymbolLevel **DEBUGSYMBOLLEVEL**
3743
abiFilters **ABIFILTERS**
3844
}
3945
versionCode **VERSIONCODE**
4046
versionName '**VERSIONNAME**'
4147
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
4248
}
4349

44-
lintOptions {
50+
lint {
4551
abortOnError false
4652
}
4753

48-
aaptOptions {
49-
noCompress = ['.ress', '.resource', '.obb'] + unityStreamingAssets.tokenize(', ')
54+
androidResources {
55+
noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
5056
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
51-
}**PACKAGING_OPTIONS**
57+
}**PACKAGING**
5258
}**REPOSITORIES**
5359
**IL_CPP_BUILD_SETUP**
5460
**SOURCE_BUILD_SETUP**

‎OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle.backup‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN
2+
3+
apply plugin: 'com.android.library'
4+
**APPLY_PLUGINS**
5+
6+
dependencies {
7+
implementation fileTree(dir: 'libs', include: ['*.jar'])
8+
// Android Resolver Dependencies Start
9+
implementation 'com.onesignal:OneSignal:5.4.2' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6
10+
// Android Resolver Dependencies End
11+
**DEPS**}
12+
13+
// Android Resolver Exclusions Start
14+
android {
15+
packagingOptions {
16+
exclude ('/lib/armeabi/*' + '*')
17+
exclude ('/lib/mips/*' + '*')
18+
exclude ('/lib/mips64/*' + '*')
19+
exclude ('/lib/x86/*' + '*')
20+
exclude ('/lib/x86_64/*' + '*')
21+
}
22+
}
23+
// Android Resolver Exclusions End
24+
android {
25+
compileSdkVersion **APIVERSION**
26+
buildToolsVersion '**BUILDTOOLS**'
27+
28+
compileOptions {
29+
sourceCompatibility JavaVersion.VERSION_1_8
30+
targetCompatibility JavaVersion.VERSION_1_8
31+
}
32+
33+
defaultConfig {
34+
minSdkVersion **MINSDKVERSION**
35+
targetSdkVersion **TARGETSDKVERSION**
36+
ndk {
37+
abiFilters **ABIFILTERS**
38+
}
39+
versionCode **VERSIONCODE**
40+
versionName '**VERSIONNAME**'
41+
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
42+
}
43+
44+
lintOptions {
45+
abortOnError false
46+
}
47+
48+
aaptOptions {
49+
noCompress = ['.ress', '.resource', '.obb'] + unityStreamingAssets.tokenize(', ')
50+
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
51+
}**PACKAGING_OPTIONS**
52+
}**REPOSITORIES**
53+
**IL_CPP_BUILD_SETUP**
54+
**SOURCE_BUILD_SETUP**
55+
**EXTERNAL_SOURCES**

‎OneSignalExample/Assets/Settings.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OneSignalExample/Assets/Settings/Build Profiles.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OneSignalExample/Packages/manifest.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
"com.onesignal.unity.android": "file:../../com.onesignal.unity.android",
44
"com.onesignal.unity.core": "file:../../com.onesignal.unity.core",
55
"com.onesignal.unity.ios": "file:../../com.onesignal.unity.ios",
6-
"com.unity.ai.navigation": "1.1.4",
7-
"com.unity.ide.rider": "3.0.24",
8-
"com.unity.ide.visualstudio": "2.0.18",
6+
"com.unity.ai.navigation": "2.0.9",
7+
"com.unity.ide.rider": "3.0.39",
8+
"com.unity.ide.visualstudio": "2.0.23",
99
"com.unity.ide.vscode": "1.2.5",
10-
"com.unity.test-framework": "1.1.33",
11-
"com.unity.textmeshpro": "3.0.6",
12-
"com.unity.timeline": "1.7.5",
13-
"com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.4",
14-
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4",
15-
"com.unity.ugui": "1.0.0",
10+
"com.unity.multiplayer.center": "1.0.0",
11+
"com.unity.test-framework": "1.6.0",
12+
"com.unity.timeline": "1.8.9",
13+
"com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.10",
14+
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
15+
"com.unity.ugui": "2.0.0",
16+
"com.unity.modules.accessibility": "1.0.0",
1617
"com.unity.modules.ai": "1.0.0",
1718
"com.unity.modules.androidjni": "1.0.0",
1819
"com.unity.modules.animation": "1.0.0",

‎OneSignalExample/Packages/packages-lock.json‎

Lines changed: 44 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
},
2525
"com.unity.ai.navigation": {
26-
"version": "1.1.5",
26+
"version": "2.0.9",
2727
"depth": 0,
2828
"source": "registry",
2929
"dependencies": {
@@ -38,14 +38,13 @@
3838
"dependencies": {}
3939
},
4040
"com.unity.ext.nunit": {
41-
"version": "1.0.6",
41+
"version": "2.0.5",
4242
"depth": 1,
43-
"source": "registry",
44-
"dependencies": {},
45-
"url": "https://packages.unity.com"
43+
"source": "builtin",
44+
"dependencies": {}
4645
},
4746
"com.unity.ide.rider": {
48-
"version": "3.0.35",
47+
"version": "3.0.39",
4948
"depth": 0,
5049
"source": "registry",
5150
"dependencies": {
@@ -54,7 +53,7 @@
5453
"url": "https://packages.unity.com"
5554
},
5655
"com.unity.ide.visualstudio": {
57-
"version": "2.0.22",
56+
"version": "2.0.23",
5857
"depth": 0,
5958
"source": "registry",
6059
"dependencies": {
@@ -69,44 +68,42 @@
6968
"dependencies": {},
7069
"url": "https://packages.unity.com"
7170
},
71+
"com.unity.multiplayer.center": {
72+
"version": "1.0.0",
73+
"depth": 0,
74+
"source": "builtin",
75+
"dependencies": {
76+
"com.unity.modules.uielements": "1.0.0"
77+
}
78+
},
7279
"com.unity.sysroot": {
73-
"version": "2.0.5",
80+
"version": "2.0.10",
7481
"depth": 1,
7582
"source": "registry",
7683
"dependencies": {},
7784
"url": "https://packages.unity.com"
7885
},
7986
"com.unity.sysroot.linux-x86_64": {
80-
"version": "2.0.4",
87+
"version": "2.0.9",
8188
"depth": 1,
8289
"source": "registry",
8390
"dependencies": {
84-
"com.unity.sysroot": "2.0.5"
91+
"com.unity.sysroot": "2.0.10"
8592
},
8693
"url": "https://packages.unity.com"
8794
},
8895
"com.unity.test-framework": {
89-
"version": "1.1.33",
96+
"version": "1.6.0",
9097
"depth": 0,
91-
"source": "registry",
98+
"source": "builtin",
9299
"dependencies": {
93-
"com.unity.ext.nunit": "1.0.6",
100+
"com.unity.ext.nunit": "2.0.3",
94101
"com.unity.modules.imgui": "1.0.0",
95102
"com.unity.modules.jsonserialize": "1.0.0"
96-
},
97-
"url": "https://packages.unity.com"
98-
},
99-
"com.unity.textmeshpro": {
100-
"version": "3.0.7",
101-
"depth": 0,
102-
"source": "registry",
103-
"dependencies": {
104-
"com.unity.ugui": "1.0.0"
105-
},
106-
"url": "https://packages.unity.com"
103+
}
107104
},
108105
"com.unity.timeline": {
109-
"version": "1.7.7",
106+
"version": "1.8.9",
110107
"depth": 0,
111108
"source": "registry",
112109
"dependencies": {
@@ -118,34 +115,40 @@
118115
"url": "https://packages.unity.com"
119116
},
120117
"com.unity.toolchain.macos-x86_64-linux-x86_64": {
121-
"version": "2.0.4",
118+
"version": "2.0.10",
122119
"depth": 0,
123120
"source": "registry",
124121
"dependencies": {
125-
"com.unity.sysroot": "2.0.5",
126-
"com.unity.sysroot.linux-x86_64": "2.0.4"
122+
"com.unity.sysroot": "2.0.10",
123+
"com.unity.sysroot.linux-x86_64": "2.0.9"
127124
},
128125
"url": "https://packages.unity.com"
129126
},
130127
"com.unity.toolchain.win-x86_64-linux-x86_64": {
131-
"version": "2.0.4",
128+
"version": "2.0.10",
132129
"depth": 0,
133130
"source": "registry",
134131
"dependencies": {
135-
"com.unity.sysroot": "2.0.5",
136-
"com.unity.sysroot.linux-x86_64": "2.0.4"
132+
"com.unity.sysroot": "2.0.10",
133+
"com.unity.sysroot.linux-x86_64": "2.0.9"
137134
},
138135
"url": "https://packages.unity.com"
139136
},
140137
"com.unity.ugui": {
141-
"version": "1.0.0",
138+
"version": "2.0.0",
142139
"depth": 0,
143140
"source": "builtin",
144141
"dependencies": {
145142
"com.unity.modules.ui": "1.0.0",
146143
"com.unity.modules.imgui": "1.0.0"
147144
}
148145
},
146+
"com.unity.modules.accessibility": {
147+
"version": "1.0.0",
148+
"depth": 0,
149+
"source": "builtin",
150+
"dependencies": {}
151+
},
149152
"com.unity.modules.ai": {
150153
"version": "1.0.0",
151154
"depth": 0,
@@ -193,6 +196,12 @@
193196
"com.unity.modules.animation": "1.0.0"
194197
}
195198
},
199+
"com.unity.modules.hierarchycore": {
200+
"version": "1.0.0",
201+
"depth": 1,
202+
"source": "builtin",
203+
"dependencies": {}
204+
},
196205
"com.unity.modules.imageconversion": {
197206
"version": "1.0.0",
198207
"depth": 0,
@@ -281,7 +290,9 @@
281290
"dependencies": {
282291
"com.unity.modules.ui": "1.0.0",
283292
"com.unity.modules.imgui": "1.0.0",
284-
"com.unity.modules.jsonserialize": "1.0.0"
293+
"com.unity.modules.jsonserialize": "1.0.0",
294+
"com.unity.modules.hierarchycore": "1.0.0",
295+
"com.unity.modules.physics": "1.0.0"
285296
}
286297
},
287298
"com.unity.modules.umbra": {

‎OneSignalExample/ProjectSettings/GvhProjectSettings.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<projectSettings>
3-
<projectSetting
4-
name="com.google.external-dependency-managerAnalyticsCookie"
5-
value="8c4c602aec1944b6b5df909c0147fa08"
6-
/>
3+
<projectSetting name="com.google.external-dependency-managerAnalyticsCookie" value="8c4c602aec1944b6b5df909c0147fa08" />
74
<projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="True" />
85
<projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
96
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
@@ -21,4 +18,4 @@
2118
<projectSetting name="GooglePlayServices.UseGradleDaemon" value="True" />
2219
<projectSetting name="GooglePlayServices.UseJetifier" value="False" />
2320
<projectSetting name="GooglePlayServices.VerboseLogging" value="True" />
24-
</projectSettings>
21+
</projectSettings>

‎OneSignalExample/ProjectSettings/MultiplayerManager.asset‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!655991488 &1
4+
MultiplayerManager:
5+
m_ObjectHideFlags: 0
6+
m_EnableMultiplayerRoles: 0
7+
m_StrippingTypes: {}

0 commit comments

Comments
 (0)