Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
LifeLogger
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PLN
LifeLogger
Commits
14592d03
Unverified
Commit
14592d03
authored
Feb 17, 2019
by
PLN (Algolia)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: API28, Gradle 3.3.1/4.10, Kotlin 1.3.0
parent
1bd40852
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
37 deletions
+19
-37
build.gradle
app/build.gradle
+15
-16
build.gradle
build.gradle
+2
-2
gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+2
-19
No files found.
app/build.gradle
View file @
14592d03
...
@@ -22,11 +22,11 @@ apply plugin: 'kotlin-android-extensions'
...
@@ -22,11 +22,11 @@ apply plugin: 'kotlin-android-extensions'
apply
plugin:
'kotlin-kapt'
apply
plugin:
'kotlin-kapt'
android
{
android
{
compileSdkVersion
2
7
compileSdkVersion
2
8
defaultConfig
{
defaultConfig
{
applicationId
"fr.plnech.lifelogger"
applicationId
"fr.plnech.lifelogger"
minSdkVersion
21
minSdkVersion
21
targetSdkVersion
2
7
targetSdkVersion
2
8
versionCode
1
versionCode
1
versionName
"1.0"
versionName
"1.0"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
...
@@ -41,37 +41,36 @@ android {
...
@@ -41,37 +41,36 @@ android {
dependencies
{
dependencies
{
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
implementation
"org.jetbrains.kotlin:kotlin-stdlib-jre
7:$kotlin_version"
implementation
"org.jetbrains.kotlin:kotlin-stdlib-jdk
7:$kotlin_version"
// Support Library
// Support Library
implementation
'com.android.support:appcompat-v7:2
7.1
.0'
implementation
'com.android.support:appcompat-v7:2
8.0
.0'
implementation
'com.android.support:design:2
7.1
.0'
implementation
'com.android.support:design:2
8.0
.0'
implementation
'com.android.support.constraint:constraint-layout:1.
0.2
'
implementation
'com.android.support.constraint:constraint-layout:1.
1.3
'
testImplementation
'junit:junit:4.12'
testImplementation
'junit:junit:4.12'
androidTestImplementation
'com.android.support.test:runner:1.0.
1
'
androidTestImplementation
'com.android.support.test:runner:1.0.
2
'
androidTestImplementation
'com.android.support.test.espresso:espresso-core:3.0.
1
'
androidTestImplementation
'com.android.support.test.espresso:espresso-core:3.0.
2
'
// ViewModel and LiveData
// ViewModel and LiveData
implementation
"android.arch.lifecycle:extensions:1.1.
0
"
implementation
"android.arch.lifecycle:extensions:1.1.
1
"
// alternatively, just ViewModel
// alternatively, just ViewModel
implementation
"android.arch.lifecycle:viewmodel:1.1.0"
//
implementation "android.arch.lifecycle:viewmodel:1.1.0"
// alternatively, just LiveData
// alternatively, just LiveData
implementation
"android.arch.lifecycle:livedata:1.1.0"
//
implementation "android.arch.lifecycle:livedata:1.1.0"
kapt
"android.arch.lifecycle:compiler:1.1.
0
"
kapt
"android.arch.lifecycle:compiler:1.1.
1
"
// Room (use 1.1.0-alpha3 for latest alpha)
// Room (use 1.1.0-alpha3 for latest alpha)
implementation
"android.arch.persistence.room:runtime:1.
0.0
"
implementation
"android.arch.persistence.room:runtime:1.
1.1
"
kapt
"android.arch.persistence.room:compiler:1.
0.0
"
kapt
"android.arch.persistence.room:compiler:1.
1.1
"
// Paging
// Paging
implementation
"android.arch.paging:runtime:1.0.
0-alpha6
"
implementation
"android.arch.paging:runtime:1.0.
1
"
// Test helpers for LiveData
// Test helpers for LiveData
testImplementation
"android.arch.core:core-testing:1.1.0"
testImplementation
"android.arch.core:core-testing:1.1.0"
// Test helpers for Room
// Test helpers for Room
testImplementation
"android.arch.persistence.room:testing:1.0.0"
testImplementation
"android.arch.persistence.room:testing:1.0.0"
}
}
build.gradle
View file @
14592d03
...
@@ -18,13 +18,13 @@
...
@@ -18,13 +18,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript
{
buildscript
{
ext
.
kotlin_version
=
'1.
2.21
'
ext
.
kotlin_version
=
'1.
3.0
'
repositories
{
repositories
{
google
()
google
()
jcenter
()
jcenter
()
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.
0
.1'
classpath
'com.android.tools.build:gradle:3.
3
.1'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
14592d03
#
#Sun Feb 17 17:46:14 CET 2019
# Copyright (C) 2018 PLNech
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
#Sat Mar 03 19:09:45 CET 2018
distributionBase
=
GRADLE_USER_HOME
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.1
0.1
-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