diff --git a/.gitignore b/.gitignore index 9044ae1..70c4606 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,8 @@ build.properties *.iml .idea out +.gradle +/local.properties +.DS_Store +build +/captures diff --git a/.travis.yml b/.travis.yml index 509872c..b48ce3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,10 @@ language: android -install: - - export SDK_LEVEL='android-22' - - android update project -p . -t $SDK_LEVEL - - cd libs/MemorizingTrustManager/ - - android update project --subprojects -p . -t $SDK_LEVEL - - cd ../.. - -script: ant debug - android: components: - platform-tools - tools - - build-tools-22.0.1 + - build-tools-21.1.1 # The SDK version used to compile your project - android-22 diff --git a/README.md b/README.md index 0936518..0467460 100644 --- a/README.md +++ b/README.md @@ -11,28 +11,42 @@ Master branch: [![Build Status](https://travis-ci.org/fixme-lausanne/MyHackerspa HOW TO COMPILE ============= -- Get the sources +First, get the sources. -```bash - git clone https://github.com/fixme-lausanne/MyHackerspace.git + git clone --recursive https://github.com/fixme-lausanne/MyHackerspace.git cd MyHackerspace - git submodule update --init -``` -- SDK properties +Android Studio +-------------- -```bash - SDK_LEVEL='android-17' #change this to the sdk level you have installed - android update project -p . -t $SDK_LEVEL - cd libs/MemorizingTrustManager/ - android update project --subprojects -p . -t $SDK_LEVEL -``` +With Android Studio, simply open the project directory and you should be set. -- Create the APK +Command Line +------------ -```bash - ant debug -``` +You can build the project using Gradle. + +The following examples use the gradle wrapper script which will automatically +download gradle to your local directory. If you want to use your own +system-wide installation instead, simply replace `./graldew` commands with +`gradle`. + +First, copy `local.properties.example` to `local.properties` and adjust the +path to your Android SDK installation. + +To build a debug APK: + + ./gradlew assembleDebug + +You will find your APK file in the ` app/build/outputs/apk/` directory. + +You can also build and directly install the file to your connected smartphone: + + ./gradlew assembleDebug installDebug + +To see other tasks that gradle offers, run + + ./graldew tasks TODO ==== diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..5c91aa7 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,25 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 17 + buildToolsVersion "21.1.1" + + defaultConfig { + applicationId "ch.fixme.status" + minSdkVersion 7 + targetSdkVersion 17 + versionCode 20 + versionName "1.8.1" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} + +dependencies { + compile project(':MemorizingTrustManager') +} \ No newline at end of file diff --git a/proguard-project.txt b/app/proguard-rules.txt similarity index 100% rename from proguard-project.txt rename to app/proguard-rules.txt diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 96% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index b033b50..95d2520 100644 --- a/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,10 +8,6 @@ android:versionCode="21" android:versionName="1.8.2" > - - diff --git a/src/ch/fixme/status/Main.java b/app/src/main/java/ch/fixme/status/Main.java similarity index 100% rename from src/ch/fixme/status/Main.java rename to app/src/main/java/ch/fixme/status/Main.java diff --git a/src/ch/fixme/status/Net.java b/app/src/main/java/ch/fixme/status/Net.java similarity index 100% rename from src/ch/fixme/status/Net.java rename to app/src/main/java/ch/fixme/status/Net.java diff --git a/src/ch/fixme/status/Network.java b/app/src/main/java/ch/fixme/status/Network.java similarity index 100% rename from src/ch/fixme/status/Network.java rename to app/src/main/java/ch/fixme/status/Network.java diff --git a/src/ch/fixme/status/Parse12.java b/app/src/main/java/ch/fixme/status/Parse12.java similarity index 100% rename from src/ch/fixme/status/Parse12.java rename to app/src/main/java/ch/fixme/status/Parse12.java diff --git a/src/ch/fixme/status/Parse13.java b/app/src/main/java/ch/fixme/status/Parse13.java similarity index 100% rename from src/ch/fixme/status/Parse13.java rename to app/src/main/java/ch/fixme/status/Parse13.java diff --git a/src/ch/fixme/status/ParseGeneric.java b/app/src/main/java/ch/fixme/status/ParseGeneric.java similarity index 100% rename from src/ch/fixme/status/ParseGeneric.java rename to app/src/main/java/ch/fixme/status/ParseGeneric.java diff --git a/src/ch/fixme/status/Prefs.java b/app/src/main/java/ch/fixme/status/Prefs.java similarity index 100% rename from src/ch/fixme/status/Prefs.java rename to app/src/main/java/ch/fixme/status/Prefs.java diff --git a/src/ch/fixme/status/Widget.java b/app/src/main/java/ch/fixme/status/Widget.java similarity index 100% rename from src/ch/fixme/status/Widget.java rename to app/src/main/java/ch/fixme/status/Widget.java diff --git a/src/ch/fixme/status/Widget_config.java b/app/src/main/java/ch/fixme/status/Widget_config.java similarity index 100% rename from src/ch/fixme/status/Widget_config.java rename to app/src/main/java/ch/fixme/status/Widget_config.java diff --git a/src/com/woozzu/android/util/StringMatcher.java b/app/src/main/java/com/woozzu/android/util/StringMatcher.java similarity index 100% rename from src/com/woozzu/android/util/StringMatcher.java rename to app/src/main/java/com/woozzu/android/util/StringMatcher.java diff --git a/src/com/woozzu/android/widget/IndexScroller.java b/app/src/main/java/com/woozzu/android/widget/IndexScroller.java similarity index 100% rename from src/com/woozzu/android/widget/IndexScroller.java rename to app/src/main/java/com/woozzu/android/widget/IndexScroller.java diff --git a/src/com/woozzu/android/widget/IndexableListView.java b/app/src/main/java/com/woozzu/android/widget/IndexableListView.java similarity index 100% rename from src/com/woozzu/android/widget/IndexableListView.java rename to app/src/main/java/com/woozzu/android/widget/IndexableListView.java diff --git a/res/drawable-hdpi/ic_action_refresh.png b/app/src/main/res/drawable-hdpi/ic_action_refresh.png similarity index 100% rename from res/drawable-hdpi/ic_action_refresh.png rename to app/src/main/res/drawable-hdpi/ic_action_refresh.png diff --git a/res/drawable-hdpi/myhs.png b/app/src/main/res/drawable-hdpi/myhs.png similarity index 100% rename from res/drawable-hdpi/myhs.png rename to app/src/main/res/drawable-hdpi/myhs.png diff --git a/res/drawable-ldpi/myhs.png b/app/src/main/res/drawable-ldpi/myhs.png similarity index 100% rename from res/drawable-ldpi/myhs.png rename to app/src/main/res/drawable-ldpi/myhs.png diff --git a/res/drawable-mdpi/ic_action_refresh.png b/app/src/main/res/drawable-mdpi/ic_action_refresh.png similarity index 100% rename from res/drawable-mdpi/ic_action_refresh.png rename to app/src/main/res/drawable-mdpi/ic_action_refresh.png diff --git a/res/drawable-mdpi/myhs.png b/app/src/main/res/drawable-mdpi/myhs.png similarity index 100% rename from res/drawable-mdpi/myhs.png rename to app/src/main/res/drawable-mdpi/myhs.png diff --git a/res/drawable-xhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png similarity index 100% rename from res/drawable-xhdpi/ic_action_refresh.png rename to app/src/main/res/drawable-xhdpi/ic_action_refresh.png diff --git a/res/drawable-xhdpi/myhs.png b/app/src/main/res/drawable-xhdpi/myhs.png similarity index 100% rename from res/drawable-xhdpi/myhs.png rename to app/src/main/res/drawable-xhdpi/myhs.png diff --git a/res/drawable/ic_action_refresh.png b/app/src/main/res/drawable/ic_action_refresh.png similarity index 100% rename from res/drawable/ic_action_refresh.png rename to app/src/main/res/drawable/ic_action_refresh.png diff --git a/res/drawable/myhs.png b/app/src/main/res/drawable/myhs.png similarity index 100% rename from res/drawable/myhs.png rename to app/src/main/res/drawable/myhs.png diff --git a/res/layout/base.xml b/app/src/main/res/layout/base.xml similarity index 100% rename from res/layout/base.xml rename to app/src/main/res/layout/base.xml diff --git a/res/layout/entry.xml b/app/src/main/res/layout/entry.xml similarity index 100% rename from res/layout/entry.xml rename to app/src/main/res/layout/entry.xml diff --git a/res/layout/entry_sensor.xml b/app/src/main/res/layout/entry_sensor.xml similarity index 100% rename from res/layout/entry_sensor.xml rename to app/src/main/res/layout/entry_sensor.xml diff --git a/res/layout/hs_choose.xml b/app/src/main/res/layout/hs_choose.xml similarity index 100% rename from res/layout/hs_choose.xml rename to app/src/main/res/layout/hs_choose.xml diff --git a/res/layout/main.xml b/app/src/main/res/layout/main.xml similarity index 100% rename from res/layout/main.xml rename to app/src/main/res/layout/main.xml diff --git a/res/layout/separator.xml b/app/src/main/res/layout/separator.xml similarity index 100% rename from res/layout/separator.xml rename to app/src/main/res/layout/separator.xml diff --git a/res/layout/subtitle.xml b/app/src/main/res/layout/subtitle.xml similarity index 100% rename from res/layout/subtitle.xml rename to app/src/main/res/layout/subtitle.xml diff --git a/res/layout/title.xml b/app/src/main/res/layout/title.xml similarity index 100% rename from res/layout/title.xml rename to app/src/main/res/layout/title.xml diff --git a/res/layout/widget.xml b/app/src/main/res/layout/widget.xml similarity index 100% rename from res/layout/widget.xml rename to app/src/main/res/layout/widget.xml diff --git a/res/layout/widget_config.xml b/app/src/main/res/layout/widget_config.xml similarity index 100% rename from res/layout/widget_config.xml rename to app/src/main/res/layout/widget_config.xml diff --git a/res/menu/main.xml b/app/src/main/res/menu/main.xml similarity index 100% rename from res/menu/main.xml rename to app/src/main/res/menu/main.xml diff --git a/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml similarity index 100% rename from res/values-da/strings.xml rename to app/src/main/res/values-da/strings.xml diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml similarity index 100% rename from res/values-nl/strings.xml rename to app/src/main/res/values-nl/strings.xml diff --git a/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml similarity index 100% rename from res/values-v11/styles.xml rename to app/src/main/res/values-v11/styles.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/res/xml/widget.xml b/app/src/main/res/xml/widget.xml similarity index 100% rename from res/xml/widget.xml rename to app/src/main/res/xml/widget.xml diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..9c79580 --- /dev/null +++ b/build.gradle @@ -0,0 +1,22 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.1.2' + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + // Add custom repositories here + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/build.xml b/build.xml deleted file mode 100644 index 65007ac..0000000 --- a/build.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/default.properties b/default.properties deleted file mode 100755 index d862034..0000000 --- a/default.properties +++ /dev/null @@ -1 +0,0 @@ -android.library.reference.1=libs/MemorizingTrustManager diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d0574d2 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 28 10:00:20 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/local.properties-example b/local.properties.example old mode 100755 new mode 100644 similarity index 100% rename from local.properties-example rename to local.properties.example diff --git a/project.properties b/project.properties deleted file mode 100644 index dc06b50..0000000 --- a/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-17 -android.library.reference.1=libs/MemorizingTrustManager diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..2a55d78 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +include ':app' +include ':MemorizingTrustManager' +project(':MemorizingTrustManager').projectDir = new File('libs/MemorizingTrustManager') \ No newline at end of file