Skip to content

Commit 9449573

Browse files
committed
Upgrade project
1 parent 23f1e3e commit 9449573

File tree

5 files changed

+23
-21
lines changed

5 files changed

+23
-21
lines changed

LINE_SDK_Unity/Assets/Plugins/Android/mainTemplate.gradle

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ allprojects {
2828
}
2929
}
3030

31-
apply plugin: 'com.android.application'
31+
apply plugin: 'com.android.library'
3232

3333
dependencies {
3434
implementation fileTree(dir: 'libs', include: ['*.jar'])
@@ -51,9 +51,10 @@ android {
5151
}
5252

5353
defaultConfig {
54+
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
5455
minSdkVersion **MINSDKVERSION**
5556
targetSdkVersion **TARGETSDKVERSION**
56-
applicationId '**APPLICATIONID**'
57+
5758
ndk {
5859
abiFilters **ABIFILTERS**
5960
}
@@ -83,17 +84,7 @@ android {
8384
}
8485
}
8586
**PACKAGING_OPTIONS**
86-
bundle {
87-
language {
88-
enableSplit = false
89-
}
90-
density {
91-
enableSplit = false
92-
}
93-
abi {
94-
enableSplit = true
95-
}
96-
}
87+
9788
}
9889

9990
**SOURCE_BUILD_SETUP**

LINE_SDK_Unity/Packages/manifest.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
5-
"com.unity.ide.rider": "1.1.4",
5+
"com.unity.ide.rider": "1.2.1",
6+
"com.unity.ide.visualstudio": "2.0.8",
67
"com.unity.ide.vscode": "1.2.3",
7-
"com.unity.test-framework": "1.1.20",
8-
"com.unity.textmeshpro": "2.0.1",
8+
"com.unity.test-framework": "1.1.24",
9+
"com.unity.textmeshpro": "2.1.4",
910
"com.unity.ugui": "1.0.0",
1011
"com.unity.xr.legacyinputhelpers": "2.1.7",
1112
"com.unity.modules.ai": "1.0.0",

LINE_SDK_Unity/Packages/packages-lock.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,23 @@
2020
"url": "https://packages.unity.com"
2121
},
2222
"com.unity.ide.rider": {
23-
"version": "1.1.4",
23+
"version": "1.2.1",
2424
"depth": 0,
2525
"source": "registry",
2626
"dependencies": {
2727
"com.unity.test-framework": "1.1.1"
2828
},
2929
"url": "https://packages.unity.com"
3030
},
31+
"com.unity.ide.visualstudio": {
32+
"version": "2.0.8",
33+
"depth": 0,
34+
"source": "registry",
35+
"dependencies": {
36+
"com.unity.test-framework": "1.1.9"
37+
},
38+
"url": "https://packages.unity.com"
39+
},
3140
"com.unity.ide.vscode": {
3241
"version": "1.2.3",
3342
"depth": 0,
@@ -36,7 +45,7 @@
3645
"url": "https://packages.unity.com"
3746
},
3847
"com.unity.test-framework": {
39-
"version": "1.1.20",
48+
"version": "1.1.24",
4049
"depth": 0,
4150
"source": "registry",
4251
"dependencies": {
@@ -47,7 +56,7 @@
4756
"url": "https://packages.unity.com"
4857
},
4958
"com.unity.textmeshpro": {
50-
"version": "2.0.1",
59+
"version": "2.1.4",
5160
"depth": 0,
5261
"source": "registry",
5362
"dependencies": {

LINE_SDK_Unity/ProjectSettings/GraphicsSettings.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ GraphicsSettings:
3838
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
3939
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
4040
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
41+
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
4142
m_PreloadedShaders: []
4243
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
4344
type: 0}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.19f1
2-
m_EditorVersionWithRevision: 2019.4.19f1 (ca5b14067cec)
1+
m_EditorVersion: 2019.4.28f1
2+
m_EditorVersionWithRevision: 2019.4.28f1 (1381962e9d08)

0 commit comments

Comments
 (0)