Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
c59f8adc
Commit
c59f8adc
authored
Jul 24, 2021
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Android Studio
parent
1eb83ad8
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
22 deletions
+26
-22
build.gradle.kts
app/build.gradle.kts
+20
-16
build.gradle.kts
build.gradle.kts
+4
-4
gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+1
-1
build.gradle.kts
stub/build.gradle.kts
+1
-1
No files found.
app/build.gradle.kts
View file @
c59f8adc
...
@@ -27,7 +27,7 @@ android {
...
@@ -27,7 +27,7 @@ android {
vectorDrawables
.
useSupportLibrary
=
true
vectorDrawables
.
useSupportLibrary
=
true
versionName
=
Config
.
version
versionName
=
Config
.
version
versionCode
=
Config
.
versionCode
versionCode
=
Config
.
versionCode
ndk
.
abiFilters
(
"armeabi-v7a"
,
"arm64-v8a"
,
"x86"
,
"x86_64"
)
ndk
.
abiFilters
.
addAll
(
listOf
(
"armeabi-v7a"
,
"arm64-v8a"
,
"x86"
,
"x86_64"
)
)
}
}
buildTypes
{
buildTypes
{
...
@@ -51,18 +51,22 @@ android {
...
@@ -51,18 +51,22 @@ android {
}
}
packagingOptions
{
packagingOptions
{
exclude
(
"/META-INF/*"
)
resources
{
exclude
(
"/org/bouncycastle/**"
)
excludes
.
add
(
"/META-INF/*"
)
exclude
(
"/kotlin/**"
)
excludes
.
add
(
"/org/bouncycastle/**"
)
exclude
(
"/kotlinx/**"
)
excludes
.
add
(
"/kotlin/**"
)
exclude
(
"/okhttp3/**"
)
excludes
.
add
(
"/kotlinx/**"
)
exclude
(
"/*.txt"
)
excludes
.
add
(
"/okhttp3/**"
)
exclude
(
"/*.bin"
)
excludes
.
add
(
"/*.txt"
)
doNotStrip
(
"**/*.so"
)
excludes
.
add
(
"/*.bin"
)
}
jniLibs
{
keepDebugSymbols
.
add
(
"**/*.so"
)
}
}
}
kotlinOptions
{
kotlinOptions
{
jvmTarget
=
"1
.8
"
jvmTarget
=
"1
1
"
}
}
}
}
...
@@ -170,7 +174,7 @@ android.applicationVariants.all {
...
@@ -170,7 +174,7 @@ android.applicationVariants.all {
}
}
}
}
}
}
registerJavaGeneratingTask
(
genSrcTask
.
get
()
,
outSrcDir
)
registerJavaGeneratingTask
(
genSrcTask
,
outSrcDir
)
}
}
dependencies
{
dependencies
{
...
@@ -185,7 +189,7 @@ dependencies {
...
@@ -185,7 +189,7 @@ dependencies {
implementation
(
"com.github.topjohnwu:lz4-java:1.7.1"
)
implementation
(
"com.github.topjohnwu:lz4-java:1.7.1"
)
implementation
(
"com.jakewharton.timber:timber:4.7.1"
)
implementation
(
"com.jakewharton.timber:timber:4.7.1"
)
val
vBC
=
"1.6
8
"
val
vBC
=
"1.6
9
"
implementation
(
"org.bouncycastle:bcprov-jdk15on:${vBC}"
)
implementation
(
"org.bouncycastle:bcprov-jdk15on:${vBC}"
)
implementation
(
"org.bouncycastle:bcpkix-jdk15on:${vBC}"
)
implementation
(
"org.bouncycastle:bcpkix-jdk15on:${vBC}"
)
...
@@ -232,10 +236,10 @@ dependencies {
...
@@ -232,10 +236,10 @@ dependencies {
implementation
(
"androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
)
implementation
(
"androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
)
implementation
(
"androidx.browser:browser:1.3.0"
)
implementation
(
"androidx.browser:browser:1.3.0"
)
implementation
(
"androidx.preference:preference:1.1.1"
)
implementation
(
"androidx.preference:preference:1.1.1"
)
implementation
(
"androidx.recyclerview:recyclerview:1.2.
0
"
)
implementation
(
"androidx.recyclerview:recyclerview:1.2.
1
"
)
implementation
(
"androidx.fragment:fragment-ktx:1.3.
3
"
)
implementation
(
"androidx.fragment:fragment-ktx:1.3.
6
"
)
implementation
(
"androidx.work:work-runtime-ktx:2.5.0"
)
implementation
(
"androidx.work:work-runtime-ktx:2.5.0"
)
implementation
(
"androidx.transition:transition:1.4.1"
)
implementation
(
"androidx.transition:transition:1.4.1"
)
implementation
(
"androidx.core:core-ktx:1.
3.2
"
)
implementation
(
"androidx.core:core-ktx:1.
6.0
"
)
implementation
(
"com.google.android.material:material:1.
3
.0"
)
implementation
(
"com.google.android.material:material:1.
4
.0"
)
}
}
build.gradle.kts
View file @
c59f8adc
...
@@ -16,8 +16,8 @@ buildscript {
...
@@ -16,8 +16,8 @@ buildscript {
extra
[
"vNav"
]
=
vNav
extra
[
"vNav"
]
=
vNav
dependencies
{
dependencies
{
classpath
(
"com.android.tools.build:gradle:
4.2.1
"
)
classpath
(
"com.android.tools.build:gradle:
7.0.0
"
)
classpath
(
kotlin
(
"gradle-plugin"
,
version
=
"1.5.
0
"
))
classpath
(
kotlin
(
"gradle-plugin"
,
version
=
"1.5.
21
"
))
classpath
(
"androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}"
)
classpath
(
"androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}"
)
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
...
@@ -54,8 +54,8 @@ subprojects {
...
@@ -54,8 +54,8 @@ subprojects {
}
}
compileOptions
{
compileOptions
{
sourceCompatibility
=
JavaVersion
.
VERSION_1
_8
sourceCompatibility
=
JavaVersion
.
VERSION_1
1
targetCompatibility
=
JavaVersion
.
VERSION_1
_8
targetCompatibility
=
JavaVersion
.
VERSION_1
1
}
}
}
}
}
}
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
c59f8adc
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-7.0-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-7.0
.2
-all.zip
stub/build.gradle.kts
View file @
c59f8adc
...
@@ -24,7 +24,7 @@ android {
...
@@ -24,7 +24,7 @@ android {
}
}
}
}
a
aptOption
s
{
a
ndroidResource
s
{
additionalParameters
(
"--package-id"
,
"0x80"
)
additionalParameters
(
"--package-id"
,
"0x80"
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment