Skip to content

Commit b7aea3e

Browse files
committed
remove common io dependencies, it cause crash because using new api
1 parent 5b5ad96 commit b7aea3e

File tree

21 files changed

+25
-789
lines changed

21 files changed

+25
-789
lines changed

app/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
minSdkVersion rootProject.ext.minSdkVersion
1212
targetSdkVersion rootProject.ext.targetSdkVersion
1313
multiDexEnabled true
14-
versionCode 44
15-
versionName "1.4.4"
14+
versionCode 45
15+
versionName "1.4.5"
1616
vectorDrawables.useSupportLibrary = true
1717
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1818
}
@@ -113,7 +113,10 @@ dependencies {
113113
api 'com.yqritc:recyclerview-flexibledivider:1.2.9'
114114
api 'com.sothree.slidinguppanel:library:3.4.0'
115115
//noinspection GradleDependency newer version cause crash
116-
// api 'commons-io:commons-io:2.2'
116+
api ('commons-io:commons-io:2.3'){
117+
transitive = true
118+
}
119+
117120
api 'com.simplecityapps:recyclerview-fastscroll:1.0.18'
118121
api 'org.apache.commons:commons-lang3:3.7'
119122
api 'com.google.guava:guava:25.1-android'

app/release/output.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":43,"versionName":"1.4.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":45,"versionName":"1.4.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/androidTest/java/com/duy/android/compiler/io/AndroidLibraryProjectExtractorTest.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010
import com.duy.android.compiler.library.LibraryCache;
1111
import com.duy.android.compiler.project.AndroidAppProject;
1212
import com.duy.android.compiler.project.AndroidProjectManager;
13-
import com.duy.android.compiler.repo.maven.ArtifactDownloader;
14-
import com.duy.android.compiler.repo.maven.MojoExecutionException;
15-
import com.duy.android.compiler.repo.maven.MojoFailureException;
13+
import com.duy.common.io.IOUtils;
1614

17-
import org.apache.commons.io.IOUtils;
1815
import org.apache.maven.model.Model;
1916
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
2017
import org.apache.maven.project.MavenProject;
@@ -90,7 +87,7 @@ public void testReadPom() throws IOException {
9087
}
9188

9289
@Test
93-
public void testDownload() throws IOException, MojoFailureException, MojoExecutionException {
90+
public void testDownload() throws IOException {
9491
Context context = InstrumentationRegistry.getTargetContext();
9592

9693
File pomFile = new File(Environment.getSdkAppDir(), "appcompat-v7-27.1.1.pom");
@@ -109,8 +106,5 @@ public void testDownload() throws IOException, MojoFailureException, MojoExecuti
109106
}
110107
MavenProject mavenProject = new MavenProject(model);
111108
System.out.println("mavenProject = " + mavenProject);
112-
113-
ArtifactDownloader artifactDownloader = new ArtifactDownloader(context, mavenProject);
114-
artifactDownloader.execute();
115109
}
116110
}

app/src/main/java/com/duy/common/purchase/Premium.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class Premium {
4848
* @param context - Android context
4949
*/
5050
public static boolean isPremiumUser(Context context) {
51-
return IS_PREMIUM || PremiumFileUtil.licenseCached(context) || true;
51+
return IS_PREMIUM || PremiumFileUtil.licenseCached(context);
5252
}
5353

5454
/**

app/src/main/java/com/duy/common/purchase/PremiumFileUtil.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import android.support.annotation.NonNull;
2222
import android.support.annotation.Nullable;
2323

24-
25-
import org.apache.commons.io.IOUtils;
24+
import com.duy.common.io.IOUtils;
2625

2726
import java.io.File;
2827
import java.io.FileInputStream;

app/src/main/java/com/duy/ide/javaide/JavaIdeActivity.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import com.duy.android.compiler.project.JavaProjectManager;
4242
import com.duy.android.compiler.utils.ProjectUtils;
4343
import com.duy.common.purchase.InAppPurchaseHelper;
44+
import com.duy.common.purchase.Premium;
4445
import com.duy.ide.R;
4546
import com.duy.ide.code.api.CodeFormatProvider;
4647
import com.duy.ide.code.api.SuggestionProvider;
@@ -171,6 +172,9 @@ public boolean onCreateOptionsMenu(Menu container) {
171172
@Override
172173
protected void onCreateNavigationMenu(Menu menu) {
173174
getMenuInflater().inflate(R.menu.menu_nav_javaide, menu);
175+
if (Premium.isPremiumUser(this)) {
176+
menu.findItem(R.id.action_premium).setVisible(false);
177+
}
174178
super.onCreateNavigationMenu(menu);
175179
}
176180

app/src/main/java/com/duy/ide/javaide/editor/autocomplete/parser/JavaClassManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.duy.android.compiler.project.JavaProject;
2424
import com.duy.common.data.Pair;
2525
import com.duy.common.interfaces.Filter;
26+
import com.duy.common.io.IOUtils;
2627
import com.duy.ide.javaide.editor.autocomplete.model.ClassDescription;
2728
import com.duy.ide.javaide.utils.DLog;
2829
import com.sun.tools.javac.tree.JCTree;
@@ -106,7 +107,7 @@ public void loadFromProject(JavaProject project) {
106107
true);
107108
for (File javaFile : javaFiles) {
108109
if (DLog.DEBUG) DLog.d(TAG, "loadFromProject: parsing class " + javaFile);
109-
String content = com.duy.android.compiler.utils.IOUtils.toString(javaFile);
110+
String content = IOUtils.toString(javaFile);
110111
JCTree.JCCompilationUnit ast = parser.parse(content);
111112
List<IClass> parseClasses = parser.parseClasses(ast);
112113
for (IClass aClass : parseClasses) {

lib-android-compiler/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ android {
2828
exclude 'META-INF/NOTICE.txt'
2929
exclude 'META-INF/notice.txt'
3030
exclude 'META-INF/ASL2.0'
31-
exclude 'META-INF/plexus/components.xml'
3231
exclude 'META-INF/INDEX.LIST'
3332
}
3433
}
@@ -54,9 +53,8 @@ dependencies {
5453

5554
api 'com.google.guava:guava:25.1-android'
5655
//noinspection GradleDependency newer version cause crash
57-
//api 'commons-io:commons-io:2.2'
56+
api 'commons-io:commons-io:2.3'
5857
api 'commons-codec:commons-codec:1.10'
5958
api 'org.apache.maven:maven-project:2.2.1'
60-
api 'org.codehaus.plexus:plexus-archiver:3.6.0'
6159
api 'com.google.code.gson:gson:2.8.1'
6260
}

lib-android-compiler/src/main/java/com/duy/android/compiler/env/Assets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.res.AssetManager;
55
import android.util.Log;
66

7-
import org.apache.commons.io.IOUtils;
7+
import com.duy.common.io.IOUtils;
88

99
import java.io.File;
1010
import java.io.FileOutputStream;

lib-android-compiler/src/main/java/com/duy/android/compiler/project/AndroidAppProject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private void writeToLibraryFile() throws JSONException, IOException {
218218
array.put(item);
219219
}
220220
String str = jsonObject.toString(1);
221-
org.apache.commons.io.IOUtils.write(str, new FileOutputStream(file), "UTF-8");
221+
IOUtils.write(str, new FileOutputStream(file), "UTF-8");
222222
}
223223

224224
public String getPackageForR() {

0 commit comments

Comments
 (0)