Skip to content

Commit

Permalink
Merge branch 'master' into lite
Browse files Browse the repository at this point in the history
  • Loading branch information
iamwood committed Aug 14, 2018
2 parents c0ba5e4 + 3051d81 commit 2024060
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.ftc_version = '3.5'
ext.ftc_version = '3.7'

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.2.1-all.zip
distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.5.1-all.zip
4 changes: 2 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
targetSdkVersion 19
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

versionCode 38
versionCode 43
versionName "$ftc_version.0-lite"

ndk {
Expand All @@ -24,7 +24,7 @@ version = android.defaultConfig.versionName
project.archivesBaseName = 'ftc-common-repackaged'

dependencies {
implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.5-lite"
implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.0-lite"
implementation "org.first.ftc:hardware:$ftc_version"
implementation "org.first.ftc:inspection:$ftc_version"
}
Expand Down

0 comments on commit 2024060

Please sign in to comment.