Skip to content

Commit 4461c5c

Browse files
authored
Merge pull request #61 from Unity-Technologies/staging-1.0.0-pre.3
Update examples for 1.0.0-pre.3
2 parents 32f6f47 + 3a87512 commit 4461c5c

File tree

58 files changed

+3478
-641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3478
-641
lines changed

AR/Assets/Materials/PlacedCubeMaterial.mat

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

AR/Assets/Materials/PlacedCubeMaterial.mat.meta renamed to AR/Assets/Plugins.meta

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

AR/Assets/Plugins/Android.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.
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
buildscript {
2+
repositories {
3+
google()
4+
jcenter()
5+
}
6+
dependencies {
7+
// Must be Android Gradle Plugin 3.6.0 or later. For a list of
8+
// compatible Gradle versions refer to:
9+
// https://developer.android.com/studio/releases/gradle-plugin
10+
classpath 'com.android.tools.build:gradle:3.6.0'
11+
}
12+
}
13+
14+
allprojects {
15+
repositories {
16+
google()
17+
jcenter()
18+
flatDir {
19+
dirs 'libs'
20+
}
21+
}
22+
}
23+
24+
apply plugin: 'com.android.application'
25+
26+
dependencies {
27+
implementation project(':unityLibrary')
28+
}
29+
30+
android {
31+
compileSdkVersion **APIVERSION**
32+
buildToolsVersion '**BUILDTOOLS**'
33+
34+
compileOptions {
35+
sourceCompatibility JavaVersion.VERSION_1_8
36+
targetCompatibility JavaVersion.VERSION_1_8
37+
}
38+
39+
defaultConfig {
40+
minSdkVersion **MINSDKVERSION**
41+
targetSdkVersion **TARGETSDKVERSION**
42+
applicationId '**APPLICATIONID**'
43+
ndk {
44+
abiFilters **ABIFILTERS**
45+
}
46+
versionCode **VERSIONCODE**
47+
versionName '**VERSIONNAME**'
48+
}
49+
50+
aaptOptions {
51+
noCompress = ['.unity3d', '.ress', '.resource', '.obb'**STREAMING_ASSETS**]
52+
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
53+
}**SIGN**
54+
55+
lintOptions {
56+
abortOnError false
57+
}
58+
59+
buildTypes {
60+
debug {
61+
minifyEnabled **MINIFY_DEBUG**
62+
useProguard **PROGUARD_DEBUG**
63+
proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
64+
jniDebuggable true
65+
}
66+
release {
67+
minifyEnabled **MINIFY_RELEASE**
68+
useProguard **PROGUARD_RELEASE**
69+
proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
70+
}
71+
}**PACKAGING_OPTIONS****SPLITS**
72+
**BUILT_APK_LOCATION**
73+
bundle {
74+
language {
75+
enableSplit = false
76+
}
77+
density {
78+
enableSplit = false
79+
}
80+
abi {
81+
enableSplit = true
82+
}
83+
}
84+
}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP**

AR/Assets/Plugins/Android/launcherTemplate.gradle.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.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
buildscript {
2+
repositories {
3+
google()
4+
jcenter()
5+
}
6+
dependencies {
7+
// Must be Android Gradle Plugin 3.6.0 or later. For a list of
8+
// compatible Gradle versions refer to:
9+
// https://developer.android.com/studio/releases/gradle-plugin
10+
classpath 'com.android.tools.build:gradle:3.6.0'
11+
}
12+
}
13+
14+
allprojects {
15+
repositories {
16+
google()
17+
jcenter()
18+
flatDir {
19+
dirs 'libs'
20+
}
21+
}
22+
}
23+
24+
apply plugin: 'com.android.library'
25+
**APPLY_PLUGINS**
26+
27+
dependencies {
28+
implementation fileTree(dir: 'libs', include: ['*.jar'])
29+
**DEPS**}
30+
31+
android {
32+
compileSdkVersion **APIVERSION**
33+
buildToolsVersion '**BUILDTOOLS**'
34+
35+
compileOptions {
36+
sourceCompatibility JavaVersion.VERSION_1_8
37+
targetCompatibility JavaVersion.VERSION_1_8
38+
}
39+
40+
defaultConfig {
41+
minSdkVersion **MINSDKVERSION**
42+
targetSdkVersion **TARGETSDKVERSION**
43+
ndk {
44+
abiFilters **ABIFILTERS**
45+
}
46+
versionCode **VERSIONCODE**
47+
versionName '**VERSIONNAME**'
48+
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
49+
}
50+
51+
lintOptions {
52+
abortOnError false
53+
}
54+
55+
aaptOptions {
56+
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
57+
}**PACKAGING_OPTIONS**
58+
}**REPOSITORIES****SOURCE_BUILD_SETUP**
59+
**EXTERNAL_SOURCES**

AR/Assets/Plugins/Android/mainTemplate.gradle.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.

0 commit comments

Comments
 (0)