Setup for maven builds

juchong · Jan 12, 2019 · 8ca8619 · 8ca8619
1 parent 16acecd
commit 8ca8619
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 3 deletions.
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ADIS16448_IMU</name>
+	<comment>Project ADIS16448-RoboRIO-Driver created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "disabled"
+}
diff --git a/C++/build.gradle b/C++/build.gradle
@@ -1,8 +1,7 @@
 plugins {
     id "cpp"
-    id "google-test-test-suite"
+	id 'maven-publish'
     id "edu.wpi.first.GradleRIO" version "2019.1.1"
-	id 'maven'
 }
 
 def includeSrcInIncludeRoot = false

diff --git a/C++/src/main/cpp/ADIS16448_IMU.cpp b/C++/src/main/cpp/ADIS16448_IMU.cpp
@@ -19,7 +19,7 @@
 #include <frc/DigitalInput.h>
 #include <frc/SPI.h>
 #include <frc/ErrorBase.h>
-#include <ADIS16448_IMU.h>
+#include <adi/ADIS16448_IMU.h>
 #include <frc/smartdashboard/SendableBuilder.h>
 #include <frc/Timer.h>
 #include <frc/WPIErrors.h>

diff --git a/C++/src/main/include/ADIS16448_IMU.h → C++/src/main/include/adi/ADIS16448_IMU.h b/C++/src/main/include/ADIS16448_IMU.h → C++/src/main/include/adi/ADIS16448_IMU.h
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,6 @@
+allprojects {
+    apply plugin: 'maven-publish'
+    repositories {
+		mavenCentral()
+    }
+}
diff --git a/C++/gradle/wrapper/gradle-wrapper.jar → gradle/wrapper/gradle-wrapper.jar b/C++/gradle/wrapper/gradle-wrapper.jar → gradle/wrapper/gradle-wrapper.jar
diff --git a/C++/gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties b/C++/gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties
diff --git a/C++/gradlew → gradlew b/C++/gradlew → gradlew
diff --git a/C++/gradlew.bat → gradlew.bat b/C++/gradlew.bat → gradlew.bat
diff --git a/C++/settings.gradle → settings.gradle b/C++/settings.gradle → settings.gradle
@@ -23,3 +23,9 @@ pluginManagement {
         }
     }
 }
+
+
+rootProject.name = 'ADIS16448_IMU'
+
+include 'Java'
+include 'C++'