Skip to content

Commit 1a47313

Browse files
committed
Upgrade gradle and dependencies
1 parent 0c29b65 commit 1a47313

File tree

6 files changed

+19
-65
lines changed

6 files changed

+19
-65
lines changed

.gitignore

+11-56
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
# [Android] ========================
21
# Built application files
32
*.apk
43
*.ap_
54

6-
# Files for the Dalvik VM
5+
# Files for the ART/Dalvik VM
76
*.dex
87

98
# Java class files
@@ -12,6 +11,7 @@
1211
# Generated files
1312
bin/
1413
gen/
14+
out/
1515

1616
# Gradle files
1717
.gradle/
@@ -26,60 +26,15 @@ proguard/
2626
# Log Files
2727
*.log
2828

29+
# Android Studio Navigation editor temp files
30+
.navigation/
2931

30-
## Directory-based project format:
31-
.idea/
32-
33-
## File-based project format:
34-
*.ipr
35-
*.iws
36-
37-
## Plugin-specific files:
38-
39-
# IntelliJ
40-
out/
41-
42-
# mpeltonen/sbt-idea plugin
43-
.idea_modules/
44-
45-
# JIRA plugin
46-
atlassian-ide-plugin.xml
47-
48-
# Crashlytics plugin (for Android Studio and IntelliJ)
49-
com_crashlytics_export_strings.xml
32+
# Android Studio captures folder
33+
captures/
5034

35+
# Intellij
36+
*.iml
37+
.idea/
5138

52-
# [Maven] ========================
53-
target/
54-
pom.xml.tag
55-
pom.xml.releaseBackup
56-
pom.xml.versionsBackup
57-
pom.xml.next
58-
release.properties
59-
60-
61-
# [Gradle-Android] ========================
62-
63-
# Ignore Gradle GUI config
64-
gradle-app.setting
65-
66-
# Gradle Signing
67-
signing.properties
68-
trestle.keystore
69-
70-
# Mobile Tools for Java (J2ME)
71-
.mtj.tmp/
72-
73-
# Package Files #
74-
*.jar
75-
*.war
76-
*.ear
77-
78-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
79-
hs_err_pid*
80-
81-
# Misc
82-
/.idea/workspace.xml
83-
.DS_Store
84-
/captures
85-
**/*.iml
39+
# Keystore files
40+
*.jks

build.gradle

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.3'
9+
classpath 'com.android.tools.build:gradle:3.0.1'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -15,13 +16,13 @@ buildscript {
1516
allprojects {
1617
repositories {
1718
jcenter()
19+
google()
1820
}
1921
ext {
20-
compileSdkVersion = 24
21-
buildToolsVersion = '25.0.3'
22+
compileSdkVersion = 27
2223
minSdkVersion = 21
23-
targetSdkVersion = 24
24-
supportLibraryVersion = '25.3.1'
24+
targetSdkVersion = 27
25+
supportLibraryVersion = '27.0.2'
2526
junitVersion = '4.12'
2627
}
2728
}

gradle/wrapper/gradle-wrapper.jar

52.4 KB
Binary file not shown.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Aug 01 17:24:40 WEST 2017
1+
#Wed Feb 14 13:34:27 WET 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

library/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apply from: 'maven-push.gradle'
33

44
android {
55
compileSdkVersion project.ext.compileSdkVersion
6-
buildToolsVersion project.ext.buildToolsVersion
76

87
defaultConfig {
98
minSdkVersion project.ext.minSdkVersion

sample/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion project.ext.compileSdkVersion
5-
buildToolsVersion project.ext.buildToolsVersion
65

76
defaultConfig {
87
applicationId "com.andremion.floatingnavigationview.sample"

0 commit comments

Comments
 (0)