Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change it as a module (and not standlon project) #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
local.properties
proguard-project.txt
/build/
*.iml
18 changes: 11 additions & 7 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ros.android.activity"
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="10"/>
package="org.ros.android.activity">


<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".AppManAndroid" android:label="@string/app_name">
<application
android:icon="@drawable/icon"
android:label="@string/app_name">

<activity
android:name=".RosAppActivity"
android:label="@string/app_name">

<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity android:name="activities.MasterChooserActivity"
<activity android:name="MasterChooserActivity"
android:label="@string/app_name">
</activity>

Expand Down
53 changes: 22 additions & 31 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,40 +14,31 @@
* the License.
*/

task wrapper(type: Wrapper) {
gradleVersion = '1.0-milestone-9'
}

allprojects {
group 'ros.android_app_manager'
version = '0.0.0-SNAPSHOT'
}
group 'org.ros'
version = '0.1.0'

repositories {
mavenLocal()
mavenCentral()
dependencies {
compile "org.ros.rosjava_core:rosjava:0.2.0"
compile "org.ros.rosjava_messages:std_msgs:[0.5,0.6)"
compile "org.ros.rosjava_messages:tf:1.11.4"
compile "org.ros.rosjava_messages:diagnostic_msgs:[0,)"
compile "org.ros.rosjava_messages:pr2_msgs:1.11.4"
compile "org.ros.rosjava_messages:pr2_power_board:1.1.2"
compile "org.ros.rosjava_messages:std_srvs:1.10.12"
compile "org.ros.rosjava_messages:app_manager:1.0.2"
compile "org.ros.rosjava_messages:create_node:2.2.1"
compile fileTree(dir: 'external_libs', include: ['*.jar'])
}

configurations.add('compile') {
exclude group: 'junit'
exclude group: 'xml-apis'
}
apply plugin: "com.android.library"

task deployLibs(type: Copy) {
from { configurations.compile }
into "${projectDir}/libs"
}

task clean << {
ant.delete file: "${projectDir}/local.properties"
ant.delete file: "${projectDir}/proguard-project.txt"
ant.delete file: "${projectDir}/build.xml"
ant.delete dir: "${projectDir}/bin"
ant.delete dir: "${projectDir}/gen"
ant.delete dir: "${projectDir}/libs"
}
android {
compileSdkVersion 10

task debug(type: Exec) {
dependsOn deployLibs
commandLine 'ant', 'debug'
defaultConfig {
minSdkVersion 10
targetSdkVersion 10
versionCode 1
versionName "1.0"
}
}
92 changes: 0 additions & 92 deletions build.xml

This file was deleted.

1 change: 0 additions & 1 deletion create_project.sh

This file was deleted.

File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion gradle.properties

This file was deleted.

Binary file removed gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties

This file was deleted.

164 changes: 0 additions & 164 deletions gradlew

This file was deleted.

Loading