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
2d556324
Commit
2d556324
authored
Apr 19, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'john/WIP' into development
# Conflicts: # gradle/wrapper/gradle-wrapper.properties
parents
e81f00ef
93fb0e3d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
27 deletions
+28
-27
build.gradle
app/build.gradle
+18
-24
proguard-rules.pro
app/proguard-rules.pro
+5
-0
App.kt
app/src/main/java/com/topjohnwu/magisk/App.kt
+2
-0
build.gradle
build.gradle
+2
-2
gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+1
-1
No files found.
app/build.gradle
View file @
2d556324
...
@@ -16,6 +16,7 @@ android {
...
@@ -16,6 +16,7 @@ android {
defaultConfig
{
defaultConfig
{
applicationId
'com.topjohnwu.magisk'
applicationId
'com.topjohnwu.magisk'
vectorDrawables
.
useSupportLibrary
=
true
vectorDrawables
.
useSupportLibrary
=
true
multiDexEnabled
true
versionName
configProps
[
'appVersion'
]
versionName
configProps
[
'appVersion'
]
versionCode
configProps
[
'appVersionCode'
]
as
Integer
versionCode
configProps
[
'appVersionCode'
]
as
Integer
javaCompileOptions
{
javaCompileOptions
{
...
@@ -41,26 +42,20 @@ dependencies {
...
@@ -41,26 +42,20 @@ dependencies {
implementation
project
(
':net'
)
implementation
project
(
':net'
)
implementation
project
(
':shared'
)
implementation
project
(
':shared'
)
implementation
project
(
':signing'
)
implementation
project
(
':signing'
)
implementation
'com.github.topjohnwu:jtar:1.0.0'
implementation
'com.github.topjohnwu:jtar:1.0.0'
implementation
'net.sourceforge.streamsupport:android-retrostreams:1.7.0'
implementation
'net.sourceforge.streamsupport:android-retrostreams:1.7.0'
implementation
'com.github.sevar83:indeterminate-checkbox:1.0.5'
implementation
'com.github.sevar83:indeterminate-checkbox:1.0.5'
implementation
'com.jakewharton.timber:timber:4.7.1'
implementation
'com.github.skoumalcz:teanity:0.3.3'
implementation
'com.ncapdevi:frag-nav:3.2.0'
def
markwonVersion
=
'3.0.0'
def
markwonVersion
=
'3.0.0'
implementation
"ru.noties.markwon:core:${markwonVersion}"
implementation
"ru.noties.markwon:core:${markwonVersion}"
implementation
"ru.noties.markwon:html:${markwonVersion}"
implementation
"ru.noties.markwon:html:${markwonVersion}"
implementation
"ru.noties.markwon:image-svg:${markwonVersion}"
implementation
"ru.noties.markwon:image-svg:${markwonVersion}"
def
androidXVersion
=
"1.0.0"
def
libsuVersion
=
'2.5.0'
implementation
'androidx.constraintlayout:constraintlayout:1.1.3'
implementation
'androidx.appcompat:appcompat:1.0.2'
implementation
"androidx.preference:preference:${androidXVersion}"
implementation
"androidx.recyclerview:recyclerview:${androidXVersion}"
implementation
"androidx.cardview:cardview:${androidXVersion}"
implementation
"com.google.android.material:material:1.1.0-alpha05"
implementation
'androidx.work:work-runtime:2.0.1'
implementation
'androidx.transition:transition:1.1.0-beta01'
def
libsuVersion
=
'2.4.0'
implementation
"com.github.topjohnwu.libsu:core:${libsuVersion}"
implementation
"com.github.topjohnwu.libsu:core:${libsuVersion}"
implementation
"com.github.topjohnwu.libsu:io:${libsuVersion}"
implementation
"com.github.topjohnwu.libsu:io:${libsuVersion}"
...
@@ -69,18 +64,17 @@ dependencies {
...
@@ -69,18 +64,17 @@ dependencies {
kapt
"com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
kapt
"com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
def
koin
=
"2.0.0-rc-2"
def
koin
=
"2.0.0-rc-2"
implementation
(
"org.koin:koin-core:${koin}"
)
implementation
"org.koin:koin-core:${koin}"
implementation
(
"org.koin:koin-android:${koin}"
)
implementation
"org.koin:koin-android:${koin}"
implementation
(
"org.koin:koin-androidx-viewmodel:${koin}"
)
implementation
"org.koin:koin-androidx-viewmodel:${koin}"
def
timber
=
"4.7.1"
implementation
"com.jakewharton.timber:timber:${timber}"
implementation
(
"com.github.skoumalcz:teanity:0.3.3"
)
{
implementation
'androidx.constraintlayout:constraintlayout:1.1.3'
exclude
group:
'androidx.work'
,
module:
'work-runtime-ktx'
implementation
'androidx.appcompat:appcompat:1.0.2'
exclude
group:
'androidx.room'
,
module:
'room-runtime'
implementation
'androidx.preference:preference:1.0.0'
}
implementation
'androidx.recyclerview:recyclerview:1.1.0-alpha04'
implementation
'androidx.cardview:cardview:1.0.0'
def
navigation
=
"3.2.0"
implementation
'com.google.android.material:material:1.1.0-alpha05'
implementation
"com.ncapdevi:frag-nav:${navigation}"
implementation
'androidx.work:work-runtime:2.0.1'
implementation
'androidx.transition:transition:1.1.0-beta01'
implementation
'androidx.multidex:multidex:2.0.1'
}
}
app/proguard-rules.pro
View file @
2d556324
...
@@ -29,6 +29,11 @@
...
@@ -29,6 +29,11 @@
void
onResponse
(
int
);
void
onResponse
(
int
);
}
}
# Keep all fragment constructors
-
keepclassmembers
class
*
extends
androidx
.
fragment
.
app
.
Fragment
{
public
<
init
>
(...);
}
# DelegateWorker
# DelegateWorker
-
keep
,
allowobfuscation
class
*
extends
com
.
topjohnwu
.
magisk
.
model
.
worker
.
DelegateWorker
-
keep
,
allowobfuscation
class
*
extends
com
.
topjohnwu
.
magisk
.
model
.
worker
.
DelegateWorker
...
...
app/src/main/java/com/topjohnwu/magisk/App.kt
View file @
2d556324
...
@@ -10,6 +10,7 @@ import android.os.AsyncTask
...
@@ -10,6 +10,7 @@ import android.os.AsyncTask
import
android.os.Build
import
android.os.Build
import
android.os.Bundle
import
android.os.Bundle
import
androidx.appcompat.app.AppCompatDelegate
import
androidx.appcompat.app.AppCompatDelegate
import
androidx.multidex.MultiDex
import
androidx.preference.PreferenceManager
import
androidx.preference.PreferenceManager
import
com.topjohnwu.magisk.data.database.MagiskDB
import
com.topjohnwu.magisk.data.database.MagiskDB
import
com.topjohnwu.magisk.data.database.RepoDatabaseHelper
import
com.topjohnwu.magisk.data.database.RepoDatabaseHelper
...
@@ -46,6 +47,7 @@ open class App : Application(), Application.ActivityLifecycleCallbacks {
...
@@ -46,6 +47,7 @@ open class App : Application(), Application.ActivityLifecycleCallbacks {
override
fun
attachBaseContext
(
base
:
Context
)
{
override
fun
attachBaseContext
(
base
:
Context
)
{
super
.
attachBaseContext
(
base
)
super
.
attachBaseContext
(
base
)
MultiDex
.
install
(
base
)
self
=
this
self
=
this
deContext
=
base
deContext
=
base
registerActivityLifecycleCallbacks
(
this
)
registerActivityLifecycleCallbacks
(
this
)
...
...
build.gradle
View file @
2d556324
...
@@ -15,7 +15,7 @@ buildscript {
...
@@ -15,7 +15,7 @@ buildscript {
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools:r8:1.4.79'
classpath
'com.android.tools:r8:1.4.79'
classpath
'com.android.tools.build:gradle:3.5.0-alpha1
0
'
classpath
'com.android.tools.build:gradle:3.5.0-alpha1
2
'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.30"
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.30"
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
2d556324
#
Fri Apr 19 09:51:32 CES
T 2019
#
Mon Apr 15 22:35:08 ED
T 2019
distributionBase
=
GRADLE_USER_HOME
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStoreBase
=
GRADLE_USER_HOME
...
...
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