Skip to content

Commit 68bd233

Browse files
westlinkinwestlinkin
committed
remove extra dependency, delete useless resources
1 parent bf7c57d commit 68bd233

File tree

15 files changed

+11
-85
lines changed

15 files changed

+11
-85
lines changed

‎.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ This is a simple Android utils library to write any type of data into cache file
1414
```Groovy
1515
compile 'com.lifeofcoding:cacheutilslibrary:1.0.1@aar'
1616
compile 'com.google.code.gson:gson:2.2.2'
17-
compile 'org.apache.commons:commons-lang3:3.1'
1817
compile 'commons-io:commons-io:2.4'
1918
```
2019

‎README_zhCN.md

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
```Groovy
1111
compile 'com.lifeofcoding:cacheutilslibrary:1.0.1@aar'
1212
compile 'com.google.code.gson:gson:2.2.2'
13-
compile 'org.apache.commons:commons-lang3:3.1'
1413
compile 'commons-io:commons-io:2.4'
1514
```
1615

‎cacheutilslibrary/build.gradle

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'com.github.dcendents.android-maven'
44
apply plugin: "com.jfrog.bintray"
55

66
// This is the library version used when deploying the artifact
7-
version = "1.0.1"
7+
version = "1.1.0"
88

99
android {
1010
compileSdkVersion 23
@@ -14,7 +14,7 @@ android {
1414
minSdkVersion 15
1515
targetSdkVersion 23
1616
versionCode 1
17-
versionName "1.0.1"
17+
versionName "1.1.0"
1818
}
1919
buildTypes {
2020
release {
@@ -25,11 +25,7 @@ android {
2525
}
2626

2727
dependencies {
28-
compile fileTree(dir: 'libs', include: ['*.jar'])
29-
testCompile 'junit:junit:4.12'
30-
compile 'com.android.support:appcompat-v7:23.0.0'
3128
compile 'com.google.code.gson:gson:2.2.2'
32-
compile 'org.apache.commons:commons-lang3:3.1'
3329
compile 'commons-io:commons-io:2.4'
3430
}
3531

‎cacheutilslibrary/cacheutilslibrary.iml

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":cacheutilslibrary" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.lifeofcoding" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":cacheutilslibrary" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.lifeofcoding" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -82,8 +82,6 @@
8282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/jars" />
8785
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8886
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-23.jar" />
@@ -100,12 +98,6 @@
10098
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
10199
<orderEntry type="sourceFolder" forTests="false" />
102100
<orderEntry type="library" exported="" name="gson-2.2.2" level="project" />
103-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
104-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
105101
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
106-
<orderEntry type="library" exported="" name="commons-lang3-3.1" level="project" />
107-
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
108-
<orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
109-
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
110102
</component>
111103
</module>

‎cacheutilslibrary/src/androidTest/java/com/lifeofcoding/cacheutlislibrary/ApplicationTest.java

-13
This file was deleted.

‎cacheutilslibrary/src/main/AndroidManifest.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.lifeofcoding.cacheutlislibrary">
33

4-
<application android:allowBackup="true"
5-
android:label="@string/app_name"
6-
android:theme="@style/AppTheme">
7-
8-
</application>
4+
<application android:allowBackup="true"/>
95

106
</manifest>

‎cacheutilslibrary/src/main/java/com/lifeofcoding/cacheutlislibrary/CacheUtils.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.lifeofcoding.cacheutlislibrary;
22

33
import android.content.Context;
4+
import android.text.TextUtils;
45
import android.util.Log;
56

67
import com.google.gson.reflect.TypeToken;
78

89
import org.apache.commons.io.FileUtils;
910
import org.apache.commons.io.IOUtils;
10-
import org.apache.commons.lang3.StringUtils;
1111

1212
import java.io.File;
1313
import java.io.FileInputStream;
@@ -44,7 +44,7 @@ private static String pathForCacheEntry(String name) {
4444
}
4545

4646
private static <T> List<Map<String, T>> dataMapsFromJson(String dataString) {
47-
if (StringUtils.isEmpty(dataString))
47+
if (TextUtils.isEmpty(dataString))
4848
return new ArrayList<Map<String, T>>();
4949

5050
try {
@@ -149,7 +149,7 @@ public static <T> T readObjectFile(String fileName, Type t) {
149149
}
150150

151151
private static <T> Map<String, T> dataMapFromJson(String dataString) {
152-
if (StringUtils.isEmpty(dataString))
152+
if (TextUtils.isEmpty(dataString))
153153
return new HashMap<String,T>();
154154

155155
try {

‎cacheutilslibrary/src/main/res/values/strings.xml

-3
This file was deleted.

‎cacheutilslibrary/src/main/res/values/styles.xml

-8
This file was deleted.

‎sample/build.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ android {
3030
}
3131

3232
dependencies {
33-
compile fileTree(dir: 'libs', include: ['*.jar'])
34-
testCompile 'junit:junit:4.12'
3533
compile 'com.android.support:appcompat-v7:23.0.0'
3634
compile project(':cacheutilslibrary')
3735
compile 'com.android.support:design:23.0.0'

‎sample/sample.iml

+2-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
8384
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.0/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/jars" />
8486
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8587
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
@@ -102,9 +104,6 @@
102104
<orderEntry type="library" exported="" name="gson-2.2.2" level="project" />
103105
<orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
104106
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
105-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
106-
<orderEntry type="library" exported="" name="commons-lang3-3.1" level="project" />
107-
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
108107
<orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
109108
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
110109
<orderEntry type="module" module-name="cacheutilslibrary" exported="" />

‎sample/src/androidTest/java/com/lifeofcoding/cacheutilslibrary_sample/ApplicationTest.java

-13
This file was deleted.

‎sample/src/main/java/com/lifeofcoding/cacheutilslibrary_sample/MainActivity.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package com.lifeofcoding.cacheutilslibrary_sample;
22

3+
import android.os.Bundle;
34
import android.support.design.widget.Snackbar;
45
import android.support.v7.app.AppCompatActivity;
5-
import android.os.Bundle;
66
import android.view.Menu;
77
import android.view.MenuItem;
88
import android.view.View;
99
import android.widget.Button;
1010
import android.widget.RadioGroup;
1111
import android.widget.RelativeLayout;
1212
import android.widget.TextView;
13-
import android.widget.Toast;
1413

1514
import com.google.gson.reflect.TypeToken;
1615
import com.lifeofcoding.cacheutlislibrary.CacheUtils;

‎sample/src/test/java/com/lifeofcoding/cacheutilslibrary/ExampleUnitTest.java

-15
This file was deleted.

0 commit comments

Comments
 (0)