TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Projects files updated, build.gradle updated

Browse Source
This commit is contained in:
serso 2015-05-30 16:08:44 +02:00
parent a01d9c3a8c
commit aab1646aa7
6 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
android-app-tests/android-app-tests.iml
View File

@ -19,8 +19,8 @@
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" /> <excludeFolder url="file://$MODULE_DIR$/build" />
@ -74,27 +74,27 @@
<orderEntry type="library" exported="" scope="TEST" name="xercesMinimal-1.9.6.2" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="xercesMinimal-1.9.6.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="nekohtml-1.9.6.2" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="nekohtml-1.9.6.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-22.1.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="support-annotations-22.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jscl-1.0.11" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="simple-xml-2.6.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="simple-xml-2.6.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-22.1.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="support-annotations-22.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="core" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-cli-1.2" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="commons-cli-1.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="annotations-2.0.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="annotations-2.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="core" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="internal_impl-22.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="stax-1.2.0" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="stax-1.2.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="leakcanary-watcher-1.3" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="leakcanary-watcher-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="common-msg-1.0.5" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="common-msg-1.0.5" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="internal_impl-22.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="common-listeners-1.0.7" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="common-listeners-1.0.7" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="guava-11.0.2" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="guava-11.0.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="common-text-1.0.7" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="common-text-1.0.7" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-2.4.0" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
@ -105,12 +105,12 @@
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="haha-1.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="haha-1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="common-security-1.0.7" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="common-security-1.0.7" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jscl-1.0.11" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="leakcanary-analyzer-1.3" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="leakcanary-analyzer-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_classes_debug" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_android_calculatorpp_android_app_build_intermediates_classes_debug" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_dependency_cache_debug" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_android_calculatorpp_android_app_build_intermediates_dependency_cache_debug" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="android" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="android" level="project" />
</component> </component>
</module> </module>

2
android-app/android-app.iml
View File

@ -121,8 +121,8 @@
<orderEntry type="library" exported="" name="leakcanary-android-1.3" level="project" /> <orderEntry type="library" exported="" name="leakcanary-android-1.3" level="project" />
<orderEntry type="library" exported="" name="common-security-1.0.7" level="project" /> <orderEntry type="library" exported="" name="common-security-1.0.7" level="project" />
<orderEntry type="library" exported="" name="play-services-analytics-7.3.0" level="project" /> <orderEntry type="library" exported="" name="play-services-analytics-7.3.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
<orderEntry type="library" exported="" name="haha-1.1" level="project" /> <orderEntry type="library" exported="" name="haha-1.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
<orderEntry type="library" exported="" name="android-common-core-1.1.18" level="project" /> <orderEntry type="library" exported="" name="android-common-core-1.1.18" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" /> <orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
<orderEntry type="library" exported="" name="common-msg-1.0.5" level="project" /> <orderEntry type="library" exported="" name="common-msg-1.0.5" level="project" />

9
android-app/proguard-debug.cfg
View File

@ -65,7 +65,8 @@
-dontwarn com.google.ads.** -dontwarn com.google.ads.**
-dontwarn com.sun.org.apache.xerces.internal.impl.dv.util.Base64 -dontwarn com.sun.org.apache.xerces.internal.impl.dv.util.Base64
-dontwarn com.actionbarsherlock.BuildConfig -dontwarn com.actionbarsherlock.BuildConfig
-dontwarn com.google.android.gms.internal.* -dontwarn com.google.android.gms.internal.**
-dontwarn com.google.android.gms.common.internal.**
-keep class org.simpleframework.xml.** { *; } -keep class org.simpleframework.xml.** { *; }
-keep class * implements org.solovyev.android.calculator.model.MathPersistenceEntity -keep class * implements org.solovyev.android.calculator.model.MathPersistenceEntity
@ -105,15 +106,13 @@
} }
# keep this otherwise it is removed by ProGuard # keep this otherwise it is removed by ProGuard
-keep public class org.acra.ErrorReporter -keep public class org.acra.ErrorReporter {
{
public void addCustomData(java.lang.String,java.lang.String); public void addCustomData(java.lang.String,java.lang.String);
public void putCustomData(java.lang.String,java.lang.String); public void putCustomData(java.lang.String,java.lang.String);
public void removeCustomData(java.lang.String); public void removeCustomData(java.lang.String);
} }
# keep this otherwise it is removed by ProGuard # keep this otherwise it is removed by ProGuard
-keep public class org.acra.ErrorReporter -keep public class org.acra.ErrorReporter {
{
public void handleSilentException(java.lang.Throwable); public void handleSilentException(java.lang.Throwable);
} }

9
android-app/proguard.cfg
View File

@ -64,7 +64,8 @@
-dontwarn com.google.ads.** -dontwarn com.google.ads.**
-dontwarn com.sun.org.apache.xerces.internal.impl.dv.util.Base64 -dontwarn com.sun.org.apache.xerces.internal.impl.dv.util.Base64
-dontwarn com.actionbarsherlock.BuildConfig -dontwarn com.actionbarsherlock.BuildConfig
-dontwarn com.google.android.gms.internal.* -dontwarn com.google.android.gms.internal.**
-dontwarn com.google.android.gms.common.internal.**
-keep class org.simpleframework.xml.** { *; } -keep class org.simpleframework.xml.** { *; }
-keep class * implements org.solovyev.android.calculator.model.MathPersistenceEntity -keep class * implements org.solovyev.android.calculator.model.MathPersistenceEntity
@ -122,15 +123,13 @@
} }
# keep this otherwise it is removed by ProGuard # keep this otherwise it is removed by ProGuard
-keep public class org.acra.ErrorReporter -keep public class org.acra.ErrorReporter {
{
public void addCustomData(java.lang.String,java.lang.String); public void addCustomData(java.lang.String,java.lang.String);
public void putCustomData(java.lang.String,java.lang.String); public void putCustomData(java.lang.String,java.lang.String);
public void removeCustomData(java.lang.String); public void removeCustomData(java.lang.String);
} }
# keep this otherwise it is removed by ProGuard # keep this otherwise it is removed by ProGuard
-keep public class org.acra.ErrorReporter -keep public class org.acra.ErrorReporter {
{
public void handleSilentException(java.lang.Throwable); public void handleSilentException(java.lang.Throwable);
} }

2
build.gradle
View File

@ -24,7 +24,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.2.2' classpath 'com.android.tools.build:gradle:1.2.3'
} }
} }

2
core/core.iml
View File

@ -19,8 +19,8 @@
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" /> <excludeFolder url="file://$MODULE_DIR$/build" />