Skip to content

Commit bcb55e6

Browse files
Jolt151Jolt151
committed
Gradle-ify
1 parent 213657c commit bcb55e6

File tree

226 files changed

+525
-2149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+525
-2149
lines changed

‎.classpath

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.gitignore

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.project

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎COPYING

Lines changed: 0 additions & 674 deletions
This file was deleted.

‎README.markdown

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎ant.properties

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎app/app.iml

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":app" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
14+
<afterSyncTasks>
15+
<task>generateDebugSources</task>
16+
</afterSyncTasks>
17+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
18+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
19+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
21+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
22+
</configuration>
23+
</facet>
24+
</component>
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
26+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
28+
<exclude-output />
29+
<content url="file://$MODULE_DIR$">
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
114+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
115+
</content>
116+
<orderEntry type="jdk" jdkName="Android API 15 Platform" jdkType="Android SDK" />
117+
<orderEntry type="sourceFolder" forTests="false" />
118+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\michael\AndroidStudioProjects\diode1\app\libs\jackson-core-asl-1.8.5.jar:unspecified@jar" level="project" />
119+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\michael\AndroidStudioProjects\diode1\app\libs\jackson-mapper-asl-1.8.5.jar:unspecified@jar" level="project" />
120+
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\michael\AndroidStudioProjects\diode1\app\libs\automaton.jar:unspecified@jar" level="project" />
121+
</component>
122+
</module>

‎app/build.gradle

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 15
5+
buildToolsVersion "27.0.3"
6+
7+
defaultConfig {
8+
applicationId "in.shick.diode"
9+
minSdkVersion 4
10+
targetSdkVersion 11
11+
}
12+
13+
buildTypes {
14+
release {
15+
minifyEnabled true
16+
proguardFiles 'proguard.cfg'
17+
}
18+
}
19+
packagingOptions{
20+
exclude 'META-INF/ASL2.0'
21+
}
22+
}
23+
24+
dependencies {
25+
compile files('libs/automaton.jar')
26+
compile files('libs/jackson-core-asl-1.8.5.jar')
27+
compile files('libs/jackson-mapper-asl-1.8.5.jar')
28+
}

‎libs/automaton.jar renamed to ‎app/libs/automaton.jar

File renamed without changes.

‎libs/jackson-core-asl-1.8.5.jar renamed to ‎app/libs/jackson-core-asl-1.8.5.jar

File renamed without changes.

‎libs/jackson-mapper-asl-1.8.5.jar renamed to ‎app/libs/jackson-mapper-asl-1.8.5.jar

File renamed without changes.

‎proguard.cfg renamed to ‎app/proguard.cfg

File renamed without changes.

‎AndroidManifest.xml renamed to ‎app/src/main/AndroidManifest.xml

File renamed without changes.

‎src/in/shick/diode/RedditIsFunApplication.java renamed to ‎app/src/main/java/in/shick/diode/RedditIsFunApplication.java

File renamed without changes.

‎src/in/shick/diode/browser/BrowserActivity.java renamed to ‎app/src/main/java/in/shick/diode/browser/BrowserActivity.java

File renamed without changes.

‎src/in/shick/diode/browser/WebViewFixed.java renamed to ‎app/src/main/java/in/shick/diode/browser/WebViewFixed.java

File renamed without changes.

‎src/in/shick/diode/captcha/CaptchaCheckRequiredTask.java renamed to ‎app/src/main/java/in/shick/diode/captcha/CaptchaCheckRequiredTask.java

File renamed without changes.

‎src/in/shick/diode/captcha/CaptchaDownloadTask.java renamed to ‎app/src/main/java/in/shick/diode/captcha/CaptchaDownloadTask.java

File renamed without changes.

‎src/in/shick/diode/captcha/CaptchaException.java renamed to ‎app/src/main/java/in/shick/diode/captcha/CaptchaException.java

File renamed without changes.

‎src/in/shick/diode/comments/CommentClickDialog.java renamed to ‎app/src/main/java/in/shick/diode/comments/CommentClickDialog.java

File renamed without changes.

‎src/in/shick/diode/comments/CommentsListActivity.java renamed to ‎app/src/main/java/in/shick/diode/comments/CommentsListActivity.java

File renamed without changes.

‎src/in/shick/diode/comments/DownloadCommentsTask.java renamed to ‎app/src/main/java/in/shick/diode/comments/DownloadCommentsTask.java

File renamed without changes.

‎src/in/shick/diode/comments/ProcessCommentsTask.java renamed to ‎app/src/main/java/in/shick/diode/comments/ProcessCommentsTask.java

File renamed without changes.

‎src/in/shick/diode/comments/SavedCommentsActivity.java renamed to ‎app/src/main/java/in/shick/diode/comments/SavedCommentsActivity.java

File renamed without changes.

‎src/in/shick/diode/comments/SavedCommentsDialog.java renamed to ‎app/src/main/java/in/shick/diode/comments/SavedCommentsDialog.java

File renamed without changes.

‎src/in/shick/diode/common/CacheInfo.java renamed to ‎app/src/main/java/in/shick/diode/common/CacheInfo.java

File renamed without changes.

‎src/in/shick/diode/common/Common.java renamed to ‎app/src/main/java/in/shick/diode/common/Common.java

File renamed without changes.

‎src/in/shick/diode/common/Constants.java renamed to ‎app/src/main/java/in/shick/diode/common/Constants.java

File renamed without changes.

‎src/in/shick/diode/common/FormValidation.java renamed to ‎app/src/main/java/in/shick/diode/common/FormValidation.java

File renamed without changes.

‎src/in/shick/diode/common/ProgressInputStream.java renamed to ‎app/src/main/java/in/shick/diode/common/ProgressInputStream.java

File renamed without changes.

‎src/in/shick/diode/common/RedditIsFunHttpClientFactory.java renamed to ‎app/src/main/java/in/shick/diode/common/RedditIsFunHttpClientFactory.java

File renamed without changes.

‎src/in/shick/diode/common/RestJsonClient.java renamed to ‎app/src/main/java/in/shick/diode/common/RestJsonClient.java

File renamed without changes.

‎src/in/shick/diode/common/tasks/HideTask.java renamed to ‎app/src/main/java/in/shick/diode/common/tasks/HideTask.java

File renamed without changes.

‎src/in/shick/diode/common/tasks/SaveTask.java renamed to ‎app/src/main/java/in/shick/diode/common/tasks/SaveTask.java

File renamed without changes.

‎src/in/shick/diode/common/tasks/VoteTask.java renamed to ‎app/src/main/java/in/shick/diode/common/tasks/VoteTask.java

File renamed without changes.

‎src/in/shick/diode/common/util/Assert.java renamed to ‎app/src/main/java/in/shick/diode/common/util/Assert.java

File renamed without changes.

‎src/in/shick/diode/common/util/CollectionUtils.java renamed to ‎app/src/main/java/in/shick/diode/common/util/CollectionUtils.java

File renamed without changes.

‎src/in/shick/diode/common/util/StringUtils.java renamed to ‎app/src/main/java/in/shick/diode/common/util/StringUtils.java

File renamed without changes.

‎src/in/shick/diode/common/util/Util.java renamed to ‎app/src/main/java/in/shick/diode/common/util/Util.java

File renamed without changes.

‎src/in/shick/diode/filters/FilterAdapter.java renamed to ‎app/src/main/java/in/shick/diode/filters/FilterAdapter.java

File renamed without changes.

‎src/in/shick/diode/filters/FilterEditActivity.java renamed to ‎app/src/main/java/in/shick/diode/filters/FilterEditActivity.java

File renamed without changes.

‎src/in/shick/diode/filters/FilterListActivity.java renamed to ‎app/src/main/java/in/shick/diode/filters/FilterListActivity.java

File renamed without changes.

‎src/in/shick/diode/filters/RedditFilterEngine.java renamed to ‎app/src/main/java/in/shick/diode/filters/RedditFilterEngine.java

File renamed without changes.

‎src/in/shick/diode/filters/SubredditFilter.java renamed to ‎app/src/main/java/in/shick/diode/filters/SubredditFilter.java

File renamed without changes.

‎src/in/shick/diode/login/LoginDialog.java renamed to ‎app/src/main/java/in/shick/diode/login/LoginDialog.java

File renamed without changes.

‎src/in/shick/diode/login/LoginTask.java renamed to ‎app/src/main/java/in/shick/diode/login/LoginTask.java

File renamed without changes.

‎src/in/shick/diode/mail/BootAlarmSetter.java renamed to ‎app/src/main/java/in/shick/diode/mail/BootAlarmSetter.java

File renamed without changes.

‎src/in/shick/diode/mail/EnvelopeService.java renamed to ‎app/src/main/java/in/shick/diode/mail/EnvelopeService.java

File renamed without changes.

‎src/in/shick/diode/mail/InboxActivity.java renamed to ‎app/src/main/java/in/shick/diode/mail/InboxActivity.java

File renamed without changes.

‎src/in/shick/diode/mail/InboxListActivity.java renamed to ‎app/src/main/java/in/shick/diode/mail/InboxListActivity.java

File renamed without changes.

‎src/in/shick/diode/mail/MessageComposeTask.java renamed to ‎app/src/main/java/in/shick/diode/mail/MessageComposeTask.java

File renamed without changes.

‎src/in/shick/diode/mail/PeekEnvelopeTask.java renamed to ‎app/src/main/java/in/shick/diode/mail/PeekEnvelopeTask.java

File renamed without changes.

‎src/in/shick/diode/markdown/Markdown.java renamed to ‎app/src/main/java/in/shick/diode/markdown/Markdown.java

File renamed without changes.

‎src/in/shick/diode/markdown/MarkdownURL.java renamed to ‎app/src/main/java/in/shick/diode/markdown/MarkdownURL.java

File renamed without changes.

‎src/in/shick/diode/reddits/PickSubredditActivity.java renamed to ‎app/src/main/java/in/shick/diode/reddits/PickSubredditActivity.java

File renamed without changes.

‎src/in/shick/diode/reddits/SubredditInfo.java renamed to ‎app/src/main/java/in/shick/diode/reddits/SubredditInfo.java

File renamed without changes.

‎src/in/shick/diode/reddits/SubscribeTask.java renamed to ‎app/src/main/java/in/shick/diode/reddits/SubscribeTask.java

File renamed without changes.

‎src/in/shick/diode/reddits/UnsubscribeTask.java renamed to ‎app/src/main/java/in/shick/diode/reddits/UnsubscribeTask.java

File renamed without changes.

‎src/in/shick/diode/saved/SavedContent.java renamed to ‎app/src/main/java/in/shick/diode/saved/SavedContent.java

File renamed without changes.

‎src/in/shick/diode/saved/SavedDBHandler.java renamed to ‎app/src/main/java/in/shick/diode/saved/SavedDBHandler.java

File renamed without changes.

0 commit comments

Comments
 (0)