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
3edcd200
Commit
3edcd200
authored
Jan 04, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade dependencies
parent
7bd52d02
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
24 deletions
+14
-24
build.gradle
app/build.gradle
+1
-4
keep.xml
app/src/full/res/xml/keep.xml
+0
-4
build.gradle
core/build.gradle
+7
-4
App.java
core/src/main/java/com/topjohnwu/core/App.java
+6
-7
RootUtils.java
core/src/main/java/com/topjohnwu/core/utils/RootUtils.java
+0
-5
No files found.
app/build.gradle
View file @
3edcd200
...
@@ -73,7 +73,6 @@ dependencies {
...
@@ -73,7 +73,6 @@ dependencies {
implementation
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
implementation
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
implementation
'androidx.core:core:1.0.1'
implementation
'androidx.core:core:1.0.1'
implementation
project
(
':net'
)
implementation
project
(
':net'
)
fullImplementation
project
(
':utils'
)
fullImplementation
project
(
':core'
)
fullImplementation
project
(
':core'
)
fullImplementation
'androidx.appcompat:appcompat:1.0.2'
fullImplementation
'androidx.appcompat:appcompat:1.0.2'
fullImplementation
"androidx.preference:preference:${rootProject.ext.androidXVersion}"
fullImplementation
"androidx.preference:preference:${rootProject.ext.androidXVersion}"
...
@@ -83,12 +82,10 @@ dependencies {
...
@@ -83,12 +82,10 @@ dependencies {
fullImplementation
'android.arch.work:work-runtime:1.0.0-beta01'
fullImplementation
'android.arch.work:work-runtime:1.0.0-beta01'
fullImplementation
'androidx.lifecycle:lifecycle-extensions:2.0.0'
fullImplementation
'androidx.lifecycle:lifecycle-extensions:2.0.0'
fullImplementation
'androidx.room:room-runtime:2.0.0'
fullImplementation
'androidx.room:room-runtime:2.0.0'
fullImplementation
'com.github.topjohnwu:libsu:2.1.2'
fullImplementation
'org.kamranzafar:jtar:2.3'
fullImplementation
'ru.noties:markwon:2.0.1'
fullImplementation
'ru.noties:markwon:2.0.1'
fullImplementation
'com.caverock:androidsvg-aar:1.3'
fullImplementation
'com.caverock:androidsvg-aar:1.3'
def
butterKnifeVersion
=
'
9.0.0-rc3
'
def
butterKnifeVersion
=
'
10.0.0
'
if
(
properties
.
containsKey
(
'android.injected.invoked.from.ide'
))
{
if
(
properties
.
containsKey
(
'android.injected.invoked.from.ide'
))
{
fullImplementation
"com.jakewharton:butterknife-reflect:${butterKnifeVersion}"
fullImplementation
"com.jakewharton:butterknife-reflect:${butterKnifeVersion}"
}
else
{
}
else
{
...
...
app/src/full/res/xml/keep.xml
deleted
100644 → 0
View file @
7bd52d02
<?xml version="1.0" encoding="utf-8"?>
<resources
xmlns:tools=
"http://schemas.android.com/tools"
tools:discard=
"@raw/busybox_arm,@raw/busybox_x86"
/>
\ No newline at end of file
core/build.gradle
View file @
3edcd200
...
@@ -26,8 +26,11 @@ android {
...
@@ -26,8 +26,11 @@ android {
dependencies
{
dependencies
{
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
implementation
project
(
':net'
)
api
project
(
':net'
)
implementation
project
(
':utils'
)
api
project
(
':utils'
)
implementation
'com.github.topjohnwu:libsu:2.1.2'
api
'org.kamranzafar:jtar:2.3'
implementation
'org.kamranzafar:jtar:2.3'
def
libsuVersion
=
'2.2.0'
api
"com.github.topjohnwu.libsu:core:${libsuVersion}"
api
"com.github.topjohnwu.libsu:io:${libsuVersion}"
}
}
core/src/main/java/com/topjohnwu/core/App.java
View file @
3edcd200
...
@@ -29,20 +29,19 @@ public class App extends ContainerApp {
...
@@ -29,20 +29,19 @@ public class App extends ContainerApp {
private
Resources
mResource
;
private
Resources
mResource
;
public
App
()
{
static
{
self
=
this
;
Shell
.
Config
.
setFlags
(
Shell
.
FLAG_MOUNT_MASTER
|
Shell
.
FLAG_USE_MAGISK_BUSYBOX
);
Shell
.
Config
.
verboseLogging
(
BuildConfig
.
DEBUG
);
Shell
.
Config
.
addInitializers
(
RootUtils
.
class
);
Shell
.
Config
.
setTimeout
(
2
);
}
}
@Override
@Override
protected
void
attachBaseContext
(
Context
base
)
{
protected
void
attachBaseContext
(
Context
base
)
{
super
.
attachBaseContext
(
base
);
super
.
attachBaseContext
(
base
);
self
=
this
;
mResource
=
base
.
getResources
();
mResource
=
base
.
getResources
();
Shell
.
Config
.
setFlags
(
Shell
.
FLAG_MOUNT_MASTER
);
Shell
.
Config
.
verboseLogging
(
BuildConfig
.
DEBUG
);
Shell
.
Config
.
setInitializer
(
RootUtils
.
class
);
Shell
.
Config
.
setTimeout
(
2
);
prefs
=
PreferenceManager
.
getDefaultSharedPreferences
(
this
);
prefs
=
PreferenceManager
.
getDefaultSharedPreferences
(
this
);
mDB
=
new
MagiskDB
(
this
);
mDB
=
new
MagiskDB
(
this
);
repoDB
=
new
RepoDatabaseHelper
(
this
);
repoDB
=
new
RepoDatabaseHelper
(
this
);
...
...
core/src/main/java/com/topjohnwu/core/utils/RootUtils.java
View file @
3edcd200
...
@@ -5,7 +5,6 @@ import android.content.Context;
...
@@ -5,7 +5,6 @@ import android.content.Context;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.Data
;
import
com.topjohnwu.core.Data
;
import
com.topjohnwu.core.R
;
import
com.topjohnwu.core.R
;
import
com.topjohnwu.superuser.BusyBox
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.io.SuFile
;
import
com.topjohnwu.superuser.io.SuFile
;
...
@@ -17,10 +16,6 @@ import androidx.annotation.NonNull;
...
@@ -17,10 +16,6 @@ import androidx.annotation.NonNull;
public
class
RootUtils
extends
Shell
.
Initializer
{
public
class
RootUtils
extends
Shell
.
Initializer
{
static
{
BusyBox
.
BB_PATH
=
new
File
(
Const
.
BUSYBOX_PATH
);
}
public
static
void
rmAndLaunch
(
String
rm
,
String
launch
)
{
public
static
void
rmAndLaunch
(
String
rm
,
String
launch
)
{
Shell
.
su
(
Utils
.
fmt
(
"(rm_launch %d %s %s)&"
,
Const
.
USER_ID
,
rm
,
launch
)).
exec
();
Shell
.
su
(
Utils
.
fmt
(
"(rm_launch %d %s %s)&"
,
Const
.
USER_ID
,
rm
,
launch
)).
exec
();
}
}
...
...
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