user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing files

Browse Source
This commit is contained in:
tom5079
2019-08-29 11:39:01 +09:00
parent 28703e9bf2 5ad2a538bc
commit 9b99baf4bc
13 changed files with 165 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build.gradle
View File

@@ -1,7 +1,11 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
<<<<<<< HEAD
ext.kotlin_version = '1.3.50'
=======
ext.kotlin_version = '1.3.41'
>>>>>>> origin/development
repositories {
google()
jcenter()
@@ -10,6 +14,7 @@ buildscript {
}
}
dependencies {
<<<<<<< HEAD
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
@@ -19,6 +24,17 @@ buildscript {
// in the individual module build.gradle files
classpath 'io.fabric.tools:gradle:1.29.0'
classpath 'com.google.firebase:perf-plugin:1.3.1'
=======
classpath 'com.android.tools.build:gradle:3.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'io.fabric.tools:gradle:1.29.0'
classpath 'com.google.firebase:perf-plugin:1.3.0'
>>>>>>> origin/development
}
}