Skip to content

Commit

Permalink
Change repo to depend on vuforia-incomplete
Browse files Browse the repository at this point in the history
  • Loading branch information
iamwood committed Sep 26, 2019
1 parent 731a7e9 commit 60604ce
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.ftc_version = '5.2'

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.5.0'
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 All @@ -18,6 +19,8 @@ allprojects {
repositories {
google()
jcenter()
maven { url 'https://jitpack.io' }
maven { url "https://raw.githubusercontent.com/Pattonville-Robotics/ftc-lib-repo/mvn-repo/" }
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Oct 30 19:28:07 CDT 2017
#Thu Sep 26 17:16:48 CDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
4 changes: 3 additions & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ project.archivesBaseName = 'vuforia-repackaged'
dependencies {
api fileTree(include: ['*.jar'], dir: 'libs')

api "org.first.ftc:vuforia-incomplete:$ftc_version"

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support:support-annotations:27.1.1'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
}
Expand Down
Binary file removed library/libs/Vuforia.jar
Binary file not shown.

0 comments on commit 60604ce

Please sign in to comment.