Skip to content

Commit

Permalink
Update gradle to 4.6, update vuforia-repackaged dependancy to 4.0.1, …
Browse files Browse the repository at this point in the history
…update gradle build tools to 3.2.1, update maven gradle plugin to 2.1, remove redundant sdk declaration in AndroidManifest
  • Loading branch information
iamwood committed Oct 19, 2018
1 parent 1d9f44b commit bb6690e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
// 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.5.1-all.zip
distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.6-all.zip
2 changes: 1 addition & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ project.archivesBaseName = 'robotcore-repackaged'
dependencies {
implementation 'com.android.support:support-annotations:27.1.1'

implementation 'com.github.modular-ftc:vuforia-repackaged:4.0.0'
implementation 'com.github.modular-ftc:vuforia-repackaged:4.0.1'

implementation 'com.google.code.gson:gson:2.8.5'
implementation 'org.danilopianini:gson-extras:0.2.1'
Expand Down
4 changes: 0 additions & 4 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
android:versionCode="46"
android:versionName="8.0" >

<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="19" />

<uses-permission
android:name="android.permission.ACCESS_WIFI_STATE"
android:required="true" />
Expand Down

0 comments on commit bb6690e

Please sign in to comment.