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
42d14d5c
Commit
42d14d5c
authored
Jun 15, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to new build tools, target API 26
parent
d3ff482c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
32 deletions
+28
-32
.gitignore
.gitignore
+1
-1
build.gradle
app/build.gradle
+20
-24
proguard-rules.pro
app/proguard-rules.pro
+2
-2
build.gradle
build.gradle
+2
-2
gradle.properties
gradle.properties
+1
-1
gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+2
-2
No files found.
.gitignore
View file @
42d14d5c
...
@@ -3,6 +3,6 @@
...
@@ -3,6 +3,6 @@
/local.properties
/local.properties
.idea/
.idea/
/build
/build
app/
app-release.apk
app/
release
*.hprof
*.hprof
app/.externalNativeBuild/
app/.externalNativeBuild/
app/build.gradle
View file @
42d14d5c
apply
plugin:
'com.android.application'
apply
plugin:
'com.android.application'
apply
plugin:
'me.tatarka.retrolambda'
android
{
android
{
compileSdkVersion
2
5
compileSdkVersion
2
6
buildToolsVersion
"2
5.0.3
"
buildToolsVersion
"2
6.0.0
"
defaultConfig
{
defaultConfig
{
applicationId
"com.topjohnwu.magisk"
applicationId
"com.topjohnwu.magisk"
minSdkVersion
21
minSdkVersion
21
targetSdkVersion
2
5
targetSdkVersion
2
6
versionCode
41
versionCode
41
versionName
"5.0.1"
versionName
"5.0.1"
ndk
{
ndk
{
...
@@ -29,7 +28,8 @@ android {
...
@@ -29,7 +28,8 @@ android {
targetCompatibility
JavaVersion
.
VERSION_1_8
targetCompatibility
JavaVersion
.
VERSION_1_8
}
}
dexOptions
{
dexOptions
{
preDexLibraries
=
true
preDexLibraries
true
javaMaxHeapSize
"2g"
}
}
externalNativeBuild
{
externalNativeBuild
{
cmake
{
cmake
{
...
@@ -39,30 +39,26 @@ android {
...
@@ -39,30 +39,26 @@ android {
lintOptions
{
lintOptions
{
disable
'MissingTranslation'
disable
'MissingTranslation'
}
}
retrolambda
{
javaVersion
JavaVersion
.
VERSION_1_7
defaultMethods
false
incremental
true
}
}
}
repositories
{
repositories
{
jcenter
()
jcenter
()
maven
{
url
"https://jitpack.io"
}
maven
{
url
"https://jitpack.io"
}
maven
{
url
"https://maven.google.com"
}
}
}
dependencies
{
dependencies
{
compile
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
implementation
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
compile
'com.android.support:recyclerview-v7:25.3.1
'
implementation
'com.android.support:recyclerview-v7:26.0.0-beta2
'
compile
'com.android.support:cardview-v7:25.3.1
'
implementation
'com.android.support:cardview-v7:26.0.0-beta2
'
compile
'com.android.support:design:25.3.1
'
implementation
'com.android.support:design:26.0.0-beta2
'
compile
'com.android.support:support-v4:25.3.1
'
implementation
'com.android.support:support-v4:26.0.0-beta2
'
compile
'com.jakewharton:butterknife:8.5.1
'
implementation
'com.jakewharton:butterknife:8.6.0
'
compile
'com.thoughtbot:expandablerecyclerview:1.4'
implementation
'com.thoughtbot:expandablerecyclerview:1.4'
compile
'us.feras.mdv:markdownview:1.1.0'
implementation
'us.feras.mdv:markdownview:1.1.0'
compile
'com.madgag.spongycastle:core:1.54.0.0'
implementation
'com.madgag.spongycastle:core:1.54.0.0'
compile
'com.madgag.spongycastle:prov:1.54.0.0'
implementation
'com.madgag.spongycastle:prov:1.54.0.0'
compile
'com.madgag.spongycastle:pkix:1.54.0.0'
implementation
'com.madgag.spongycastle:pkix:1.54.0.0'
compile
'com.madgag.spongycastle:pg:1.54.0.0'
implementation
'com.madgag.spongycastle:pg:1.54.0.0'
compile
'com.google.android.gms:play-services-safetynet:9.0.1'
implementation
'com.google.android.gms:play-services-safetynet:9.0.1'
annotationProcessor
'com.jakewharton:butterknife-compiler:8.
5.1
'
annotationProcessor
'com.jakewharton:butterknife-compiler:8.
6.0
'
}
}
app/proguard-rules.pro
View file @
42d14d5c
...
@@ -20,6 +20,6 @@
...
@@ -20,6 +20,6 @@
-
keep
class
org
.
spongycastle
.
**
{
*
;
}
-
keep
class
org
.
spongycastle
.
**
{
*
;
}
-
dontwarn
javax
.
naming
.
**
-
dontwarn
javax
.
naming
.
**
# retrolambda
-
dontwarn
android
.
content
.
**
-
dontwarn
java
.
lang
.
invoke
.
*
-
dontwarn
android
.
animation
.
*
*
build.gradle
View file @
42d14d5c
...
@@ -4,10 +4,10 @@ buildscript {
...
@@ -4,10 +4,10 @@ buildscript {
repositories
{
repositories
{
jcenter
()
jcenter
()
mavenCentral
()
mavenCentral
()
maven
{
url
"https://maven.google.com"
}
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:2.3.2'
classpath
'com.android.tools.build:gradle:3.0.0-alpha3'
classpath
'me.tatarka:gradle-retrolambda:3.6.1'
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
// in the individual module build.gradle files
...
...
gradle.properties
View file @
42d14d5c
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process.
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# Default value: -Xmx10248m -XX:MaxPermSize=256m
org.gradle.jvmargs
=
-Xmx
4096m -XX:MaxPermSize=4096
m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs
=
-Xmx
2560
m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# This option should only be used with decoupled projects. More details, visit
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
42d14d5c
#
Wed Apr 05 09:31:45
CST 2017
#
Thu Jun 15 18:40:02
CST 2017
distributionBase
=
GRADLE_USER_HOME
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-
3.3
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.0-milestone-1
-all.zip
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