Skip to content

Commit 367fb21

Browse files
committed
Updated to latest AS and gradle versions and cleaned up unneeded files.
1 parent dcb5493 commit 367fb21

20 files changed

+196
-133
lines changed

.gitignore

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,38 @@
1-
# built application files
2-
*.apk
3-
*.ap_
4-
5-
# files for the dex VM
6-
*.dex
7-
8-
# Java class files
9-
*.class
10-
11-
# built native files
12-
*.o
13-
*.so
14-
15-
# generated files
16-
bin/
17-
gen/
18-
19-
# Ignore gradle files
20-
.gradle/
1+
# Built application files
2+
/*/build/
213
build/
22-
/*/build
23-
4+
5+
# Crashlytics configuations
6+
com_crashlytics_export_strings.xml
7+
248
# Local configuration file (sdk path, etc)
259
local.properties
26-
27-
# Proguard folder generated by Eclipse
28-
proguard/
29-
30-
# Eclipse Metadata
31-
.metadata/
32-
33-
# Mac OS X clutter
34-
*.DS_Store
35-
36-
# Windows clutter
37-
Thumbs.db
38-
39-
# Intellij IDEA (see https://intellij-support.jetbrains.com/entries/23393067)
10+
11+
# Gradle generated files
12+
.gradle/
13+
14+
# Signing files
15+
.signing/
16+
17+
# User-specific configurations
18+
.idea/libraries/
4019
.idea/workspace.xml
4120
.idea/tasks.xml
42-
.idea/datasources.xml
43-
.idea/dataSources.ids
21+
.idea/.name
22+
.idea/compiler.xml
23+
.idea/copyright/profiles_settings.xml
24+
.idea/encodings.xml
25+
.idea/misc.xml
26+
.idea/modules.xml
27+
.idea/scopes/scope_settings.xml
28+
.idea/vcs.xml
29+
*.iml
30+
31+
# OS-specific files
32+
.DS_Store
33+
.DS_Store?
34+
._*
35+
.Spotlight-V100
36+
.Trashes
37+
ehthumbs.db
38+
Thumbs.db

.idea/gradle.xml

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

.idea/libraries/support_annotations_20_0_0.xml

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

.idea/libraries/support_annotations_21_0_0.xml

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

.idea/libraries/support_v13_20_0_0.xml

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

.idea/libraries/support_v13_21_0_0.xml

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

.idea/libraries/support_v4_20_0_0.xml

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

.idea/libraries/support_v4_21_0_0.xml

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

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

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

.idea/uiDesigner.xml

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

ViewPagerTransforms.iml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
</configuration>
88
</facet>
99
</component>
10-
<component name="NewModuleRootManager" inherit-compiler-output="true">
10+
<component name="NewModuleRootManager" inherit-compiler-output="false">
11+
<output url="file://$MODULE_DIR$/build/classes/main" />
12+
<output-test url="file://$MODULE_DIR$/build/classes/test" />
1113
<exclude-output />
1214
<content url="file://$MODULE_DIR$">
1315
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

app/app.iml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
3941
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4042
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4143
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

app/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616

1717
apply plugin: 'com.android.application'
18-
apply plugin: 'maven'
1918

2019
repositories {
2120
maven {
@@ -28,7 +27,7 @@ repositories {
2827

2928
android {
3029
compileSdkVersion 21
31-
buildToolsVersion "21.0.0"
30+
buildToolsVersion "21.1.2"
3231

3332
defaultConfig {
3433
applicationId "com.ToxicBakery.viewpager.transforms"
@@ -39,15 +38,13 @@ android {
3938
}
4039
buildTypes {
4140
release {
42-
runProguard false
41+
minifyEnabled false
4342
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
4443
}
4544
}
4645
}
4746

4847
dependencies {
49-
compile fileTree(dir: 'libs', include: ['*.jar'])
5048
compile 'com.android.support:support-v13:20.0.0'
5149
compile project(':library')
52-
//compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.0.0@aar'
5350
}

0 commit comments

Comments
 (0)