Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Open sidebar
gitter
gitter-android-app
Commits
56576882
Commit
56576882
authored
Aug 01, 2018
by
Eric Eastwood
Browse files
Update to latest Gradle and build tools version
parent
4b367156
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
15 deletions
+40
-15
.idea/caches/build_file_checksums.ser
.idea/caches/build_file_checksums.ser
+0
-0
.idea/misc.xml
.idea/misc.xml
+25
-0
.idea/vcs.xml
.idea/vcs.xml
+1
-1
app/build.gradle
app/build.gradle
+10
-10
build.gradle
build.gradle
+1
-1
gitter-android-app.iml
gitter-android-app.iml
+1
-1
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+2
-2
No files found.
.idea/caches/build_file_checksums.ser
View file @
56576882
No preview for this file type
.idea/misc.xml
View file @
56576882
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"NullableNotNullManager"
>
<option
name=
"myDefaultNullable"
value=
"android.support.annotation.Nullable"
/>
<option
name=
"myDefaultNotNull"
value=
"android.support.annotation.NonNull"
/>
<option
name=
"myNullables"
>
<value>
<list
size=
"5"
>
<item
index=
"0"
class=
"java.lang.String"
itemvalue=
"org.jetbrains.annotations.Nullable"
/>
<item
index=
"1"
class=
"java.lang.String"
itemvalue=
"javax.annotation.Nullable"
/>
<item
index=
"2"
class=
"java.lang.String"
itemvalue=
"javax.annotation.CheckForNull"
/>
<item
index=
"3"
class=
"java.lang.String"
itemvalue=
"edu.umd.cs.findbugs.annotations.Nullable"
/>
<item
index=
"4"
class=
"java.lang.String"
itemvalue=
"android.support.annotation.Nullable"
/>
</list>
</value>
</option>
<option
name=
"myNotNulls"
>
<value>
<list
size=
"4"
>
<item
index=
"0"
class=
"java.lang.String"
itemvalue=
"org.jetbrains.annotations.NotNull"
/>
<item
index=
"1"
class=
"java.lang.String"
itemvalue=
"javax.annotation.Nonnull"
/>
<item
index=
"2"
class=
"java.lang.String"
itemvalue=
"edu.umd.cs.findbugs.annotations.NonNull"
/>
<item
index=
"3"
class=
"java.lang.String"
itemvalue=
"android.support.annotation.NonNull"
/>
</list>
</value>
</option>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_7"
project-jdk-name=
"1.8"
project-jdk-type=
"JavaSDK"
>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
</component>
...
...
.idea/vcs.xml
View file @
56576882
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"VcsDirectoryMappings"
>
<mapping
directory=
""
vcs=
"Git"
/>
<mapping
directory=
"
$PROJECT_DIR$
"
vcs=
"Git"
/>
</component>
</project>
\ No newline at end of file
app/build.gradle
View file @
56576882
...
...
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android
{
compileSdkVersion
24
buildToolsVersion
'2
6
.0.
2
'
buildToolsVersion
'2
7
.0.
3
'
defaultConfig
{
applicationId
"im.gitter.gitter"
...
...
@@ -24,13 +24,13 @@ repositories {
}
dependencies
{
co
mp
i
le
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
co
mp
i
le
'com.android.support:design:24.2.1'
co
mp
i
le
"com.mixpanel.android:mixpanel-android:4.6.4"
co
mp
i
le
'com.android.volley:volley:1.0.0'
co
mp
i
le
"com.google.android.gms:play-services-gcm:9.6.1"
co
mp
i
le
'joda-time:joda-time:2.5'
co
mp
i
le
'com.github.rahatarmanahmed:circularprogressview:2.4.0'
co
mp
i
le
'com.getbase:floatingactionbutton:1.10.1'
test
Co
mp
i
le
'junit:junit:4.12'
i
mple
mentation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
i
mple
mentation
'com.android.support:design:24.2.1'
i
mple
mentation
"com.mixpanel.android:mixpanel-android:4.6.4"
i
mple
mentation
'com.android.volley:volley:1.0.0'
i
mple
mentation
"com.google.android.gms:play-services-gcm:9.6.1"
i
mple
mentation
'joda-time:joda-time:2.5'
i
mple
mentation
'com.github.rahatarmanahmed:circularprogressview:2.4.0'
i
mple
mentation
'com.getbase:floatingactionbutton:1.10.1'
test
I
mple
mentation
'junit:junit:4.12'
}
build.gradle
View file @
56576882
...
...
@@ -6,7 +6,7 @@ buildscript {
google
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.
0.1
'
classpath
'com.android.tools.build:gradle:3.
1.3
'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
...
...
gitter-android-app.iml
View file @
56576882
...
...
@@ -13,7 +13,7 @@
<content
url=
"file://$MODULE_DIR$"
>
<excludeFolder
url=
"file://$MODULE_DIR$/.gradle"
/>
</content>
<orderEntry
type=
"
jdk"
jdkName=
"1.8"
jdkType=
"JavaSDK
"
/>
<orderEntry
type=
"
inheritedJdk
"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
</component>
</module>
\ No newline at end of file
gradle/wrapper/gradle-wrapper.properties
View file @
56576882
#
Thu Mar 15 20:04:50 GM
T 2018
#
Wed Aug 01 00:59:48 CD
T 2018
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
1
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
4
-all.zip
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment