Commit c5d66cb2d6be046b3f9531245a3e11a99750ad59
1 parent
9f007249
little modification
Showing
7 changed files
with
23 additions
and
3 deletions
Show diff stats
.idea/gradle.xml
| @@ -8,7 +8,9 @@ | @@ -8,7 +8,9 @@ | ||
| 8 | <option name="modules"> | 8 | <option name="modules"> |
| 9 | <set> | 9 | <set> |
| 10 | <option value="$PROJECT_DIR$" /> | 10 | <option value="$PROJECT_DIR$" /> |
| 11 | + <option value="$PROJECT_DIR$/acrylic" /> | ||
| 11 | <option value="$PROJECT_DIR$/app" /> | 12 | <option value="$PROJECT_DIR$/app" /> |
| 13 | + <option value="$PROJECT_DIR$/puzzlegame" /> | ||
| 12 | </set> | 14 | </set> |
| 13 | </option> | 15 | </option> |
| 14 | <option name="resolveModulePerSourceSet" value="false" /> | 16 | <option name="resolveModulePerSourceSet" value="false" /> |
.idea/modules.xml
| @@ -3,7 +3,9 @@ | @@ -3,7 +3,9 @@ | ||
| 3 | <component name="ProjectModuleManager"> | 3 | <component name="ProjectModuleManager"> |
| 4 | <modules> | 4 | <modules> |
| 5 | <module fileurl="file://$PROJECT_DIR$/SSRMarcSautelet.iml" filepath="$PROJECT_DIR$/SSRMarcSautelet.iml" /> | 5 | <module fileurl="file://$PROJECT_DIR$/SSRMarcSautelet.iml" filepath="$PROJECT_DIR$/SSRMarcSautelet.iml" /> |
| 6 | + <module fileurl="file://$PROJECT_DIR$/acrylic/acrylic.iml" filepath="$PROJECT_DIR$/acrylic/acrylic.iml" /> | ||
| 6 | <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> | 7 | <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> |
| 8 | + <module fileurl="file://$PROJECT_DIR$/puzzlegame/puzzlegame.iml" filepath="$PROJECT_DIR$/puzzlegame/puzzlegame.iml" /> | ||
| 7 | </modules> | 9 | </modules> |
| 8 | </component> | 10 | </component> |
| 9 | </project> | 11 | </project> |
| 10 | \ No newline at end of file | 12 | \ No newline at end of file |
acrylic/build.gradle
| @@ -27,6 +27,6 @@ dependencies { | @@ -27,6 +27,6 @@ dependencies { | ||
| 27 | androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { | 27 | androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { |
| 28 | exclude group: 'com.android.support', module: 'support-annotations' | 28 | exclude group: 'com.android.support', module: 'support-annotations' |
| 29 | }) | 29 | }) |
| 30 | - compile 'com.android.support:appcompat-v7:25.1.1' | 30 | + compile 'com.android.support:appcompat-v7:25.3.0' |
| 31 | testCompile 'junit:junit:4.12' | 31 | testCompile 'junit:junit:4.12' |
| 32 | } | 32 | } |
acrylic/proguard-rules.pro
| @@ -15,3 +15,11 @@ | @@ -15,3 +15,11 @@ | ||
| 15 | #-keepclassmembers class fqcn.of.javascript.interface.for.webview { | 15 | #-keepclassmembers class fqcn.of.javascript.interface.for.webview { |
| 16 | # public *; | 16 | # public *; |
| 17 | #} | 17 | #} |
| 18 | + | ||
| 19 | +# Uncomment this to preserve the line number information for | ||
| 20 | +# debugging stack traces. | ||
| 21 | +#-keepattributes SourceFile,LineNumberTable | ||
| 22 | + | ||
| 23 | +# If you keep the line number information, uncomment this to | ||
| 24 | +# hide the original source file name. | ||
| 25 | +#-renamesourcefileattribute SourceFile |
puzzlegame/build.gradle
| @@ -27,6 +27,6 @@ dependencies { | @@ -27,6 +27,6 @@ dependencies { | ||
| 27 | androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { | 27 | androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { |
| 28 | exclude group: 'com.android.support', module: 'support-annotations' | 28 | exclude group: 'com.android.support', module: 'support-annotations' |
| 29 | }) | 29 | }) |
| 30 | - compile 'com.android.support:appcompat-v7:25.1.1' | 30 | + compile 'com.android.support:appcompat-v7:25.3.0' |
| 31 | testCompile 'junit:junit:4.12' | 31 | testCompile 'junit:junit:4.12' |
| 32 | } | 32 | } |
puzzlegame/proguard-rules.pro
| @@ -15,3 +15,11 @@ | @@ -15,3 +15,11 @@ | ||
| 15 | #-keepclassmembers class fqcn.of.javascript.interface.for.webview { | 15 | #-keepclassmembers class fqcn.of.javascript.interface.for.webview { |
| 16 | # public *; | 16 | # public *; |
| 17 | #} | 17 | #} |
| 18 | + | ||
| 19 | +# Uncomment this to preserve the line number information for | ||
| 20 | +# debugging stack traces. | ||
| 21 | +#-keepattributes SourceFile,LineNumberTable | ||
| 22 | + | ||
| 23 | +# If you keep the line number information, uncomment this to | ||
| 24 | +# hide the original source file name. | ||
| 25 | +#-renamesourcefileattribute SourceFile |
settings.gradle