Skip to content

Commit 17981ec

Browse files
committed
Use AndroidX dependencies instead of src-external
1 parent 65c2865 commit 17981ec

16 files changed

+76
-4194
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
!/build.gradle
77
!/COPYING
88
!/gradle
9+
!/gradle.properties
910
!/gradlew
1011
!/gradlew.bat
1112
!/jni
13+
!/proguard-rules.pro
1214
!/README.md
1315
!/res
1416
!/src
1517
!/src-api
16-
!/src-external
1718
!/update

build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232

3333
sourceSets.main {
3434
manifest.srcFile 'AndroidManifest.xml'
35-
java.srcDirs = ['src', 'src-api', 'src-external']
35+
java.srcDirs = ['src', 'src-api']
3636
resources.srcDirs = ['src']
3737
aidl.srcDirs = ['src']
3838
renderscript.srcDirs = ['src']
@@ -84,10 +84,11 @@ android {
8484
minifyEnabled false
8585
}
8686
release {
87-
minifyEnabled false
87+
minifyEnabled true
8888
}
8989
all {
9090
crunchPngs false
91+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
9192
}
9293
}
9394

@@ -112,4 +113,6 @@ android {
112113

113114
dependencies {
114115
compileOnly 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
116+
implementation 'androidx.drawerlayout:drawerlayout:1.1.0'
117+
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
115118
}

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
android.useAndroidX=true

proguard-rules.pro

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-dontobfuscate
2+
-keep class com.mishiranu.dashchan.** { *; }
3+
-keep class chan.** { *; }

res/layout/activity_main.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<!--
4-
Copyright 2014-2016 Fukurou Mishiranu
4+
Copyright 2014-2016, 2020 Fukurou Mishiranu
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616
limitations under the License.
1717
-->
1818

19-
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
19+
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
2020
xmlns:tools="http://schemas.android.com/tools"
2121
android:id="@+id/drawer_layout"
2222
android:layout_width="match_parent"
@@ -43,4 +43,4 @@
4343
android:layout_height="match_parent"
4444
android:layout_gravity="start" />
4545

46-
</android.support.v4.widget.DrawerLayout>
46+
</androidx.drawerlayout.widget.DrawerLayout>

src-external/android/support/v4/content/LocalBroadcastManager.java

-257
This file was deleted.

0 commit comments

Comments
 (0)