Skip to content

Commit 475d386

Browse files
fadi-georgefadi-george
committed
update gradle templates
1 parent 4f03350 commit 475d386

12 files changed

+165
-26
lines changed

‎OneSignalExample/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
44
#
5+
/.utmp/
56
/[Ll]ibrary/
67
/[Tt]emp/
78
/[Oo]bj/

‎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/gradleTemplate.properties.backup.meta‎

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

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
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 {
78
implementation fileTree(dir: 'libs', include: ['*.jar'])
89
// Android Resolver Dependencies Start
9-
implementation 'com.onesignal:OneSignal:5.1.37' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6
10+
implementation 'com.onesignal:OneSignal:5.3.0-alpha-01' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6
1011
// Android Resolver Dependencies End
1112
**DEPS**}
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.3.0-alpha-01' // 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/Plugins/Android/mainTemplate.gradle.backup.meta‎

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

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

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

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

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

‎OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dependencies>
22
<packages>
3-
<package>com.onesignal:OneSignal:5.1.37</package>
3+
<package>com.onesignal:OneSignal:5.3.0-alpha-01</package>
44
</packages>
55
<files />
66
<settings>
@@ -18,6 +18,6 @@
1818
<setting name="projectExportEnabled" value="False" />
1919
<setting name="useFullCustomMavenRepoPathWhenExport" value="True" />
2020
<setting name="useFullCustomMavenRepoPathWhenNotExport" value="False" />
21-
<setting name="useJetifier" value="False" />
21+
<setting name="useJetifier" value="True" />
2222
</settings>
2323
</dependencies>

0 commit comments

Comments
 (0)