diff options
71 files changed, 64 insertions, 1251 deletions
@@ -8,24 +8,6 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "atty" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "base64" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -85,20 +67,6 @@ dependencies = [ ] [[package]] -name = "clap" -version = "2.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "clear_on_drop" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -198,14 +166,6 @@ version = "0.2.40" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "lockchain-cli" -version = "0.1.0" -dependencies = [ - "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lockchain-core 0.2.0", -] - -[[package]] name = "lockchain-core" version = "0.2.0" dependencies = [ @@ -222,7 +182,19 @@ dependencies = [ ] [[package]] -name = "lockchain-gtk" +name = "lockchain-crypto" +version = "0.1.0" + +[[package]] +name = "lockchain-files" +version = "0.1.0" + +[[package]] +name = "lockchain-http" +version = "0.1.0" + +[[package]] +name = "lockchain-server" version = "0.1.0" [[package]] @@ -326,14 +298,6 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "redox_termios" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "rust-crypto" version = "0.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -392,11 +356,6 @@ dependencies = [ ] [[package]] -name = "strsim" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "subtle" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -412,24 +371,6 @@ dependencies = [ ] [[package]] -name = "termion" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "textwrap" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "time" version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -445,21 +386,11 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "unicode-width" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "unicode-xid" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "vec_map" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "winapi" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -480,8 +411,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] "checksum aesni 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5e88c3698cd61460af7bdbcc747d0e37b61255492fcfc81845dd4666f3bf6714" -"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "af80143d6f7608d746df1520709e5d141c96f240b0e62b0aa41bdfb53374d9d4" "checksum base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c4a342b450b268e1be8036311e2c613d7f8a7ed31214dff1cc3b60852a3168d" "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" "checksum blake2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0da79fe9391e02df251e0d86197332d398b4721e80722fc91b9c4cbde3ce355" @@ -490,7 +419,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "73b5bdfe7ee3ad0b99c9801d58807a9dbc9e09196365b0203853b99889ab3c87" "checksum cc 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8b9d2900f78631a5876dc5d6c9033ede027253efcd33dd36b1309fc6cab97ee0" "checksum chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1cce36c92cb605414e9b824f866f5babe0a0368e39ea07393b9b63cf3844c0e6" -"checksum clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0f16b89cbb9ee36d87483dc939fe9f1e13c05898d56d7b230a0d4dff033a536" "checksum clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17" "checksum cmac 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44f175b5f76aa82ebe4c7e85ef95b23e9293c5618db28461cb10ee929e0f6e2f" "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" @@ -517,7 +445,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" "checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd" -"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f" @@ -525,16 +452,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum serde_derive 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "f0477feff739386f5bca8e13fa43d96a4e834904d538f503906c8179f9205f50" "checksum serde_derive_internals 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9d30c4596450fd7bbda79ef15559683f9a79ac0193ea819db90000d7e1cae794" "checksum serde_json 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "8f6f1f77b969caa064f347544d703efacaf4854b84831096a5dc206a8aedbc27" -"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" "checksum subtle 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7a6bab57c3efd01ebd3d750f4244ae0af4cdd1fc505a7904a41603192b803c5" "checksum syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91b52877572087400e83d24b9178488541e3d535259e04ff17a63df1e5ceff59" -"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" -"checksum textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693" "checksum time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "a15375f1df02096fb3317256ce2cee6a1f42fc84ea5ad5fc8c421cfe40c73098" "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" -"checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -"checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c" "checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" @@ -1,6 +1,14 @@ [workspace] members = [ + + # Core library components to create & parse vaults "lockchain-core", - "lockchain-gtk", - "lockchain-cli" + "lockchain-core/lockchain-files", + "lockchain-core/lockchain-crypto", + + # Primary data server + "lockchain-server", + + # RESTful API layer + "lockchain-http", ]
\ No newline at end of file diff --git a/lockchain-android/.gitignore b/lockchain-android/.gitignore deleted file mode 100644 index 5edb4ee..0000000 --- a/lockchain-android/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -.DS_Store -/build -/captures -.externalNativeBuild diff --git a/lockchain-android/.idea/caches/build_file_checksums.ser b/lockchain-android/.idea/caches/build_file_checksums.ser Binary files differdeleted file mode 100644 index 4b46c8f..0000000 --- a/lockchain-android/.idea/caches/build_file_checksums.ser +++ /dev/null diff --git a/lockchain-android/.idea/codeStyles/Project.xml b/lockchain-android/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/lockchain-android/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ -<component name="ProjectCodeStyleConfiguration"> - <code_scheme name="Project" version="173"> - <Objective-C-extensions> - <file> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" /> - </file> - <class> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" /> - </class> - <extensions> - <pair source="cpp" header="h" fileNamingConvention="NONE" /> - <pair source="c" header="h" fileNamingConvention="NONE" /> - </extensions> - </Objective-C-extensions> - </code_scheme> -</component>
\ No newline at end of file diff --git a/lockchain-android/.idea/gradle.xml b/lockchain-android/.idea/gradle.xml deleted file mode 100644 index a222710..0000000 --- a/lockchain-android/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="GradleSettings"> - <option name="linkedExternalProjectsSettings"> - <GradleProjectSettings> - <option name="distributionType" value="DEFAULT_WRAPPED" /> - <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="modules"> - <set> - <option value="$PROJECT_DIR$" /> - <option value="$PROJECT_DIR$/mobile" /> - <option value="$PROJECT_DIR$/wear" /> - </set> - </option> - <option name="resolveModulePerSourceSet" value="false" /> - </GradleProjectSettings> - </option> - </component> -</project>
\ No newline at end of file diff --git a/lockchain-android/.idea/misc.xml b/lockchain-android/.idea/misc.xml deleted file mode 100644 index 99202cc..0000000 --- a/lockchain-android/.idea/misc.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="NullableNotNullManager"> - <option name="myDefaultNullable" value="android.support.annotation.Nullable" /> - <option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> - <option name="myNullables"> - <value> - <list size="5"> - <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> - <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> - <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" /> - <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> - <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> - </list> - </value> - </option> - <option name="myNotNulls"> - <value> - <list size="4"> - <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" /> - <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" /> - <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" /> - <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" /> - </list> - </value> - </option> - </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/build/classes" /> - </component> - <component name="ProjectType"> - <option name="id" value="Android" /> - </component> -</project>
\ No newline at end of file diff --git a/lockchain-android/.idea/runConfigurations.xml b/lockchain-android/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/lockchain-android/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="RunConfigurationProducerService"> - <option name="ignoredProducers"> - <set> - <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" /> - <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" /> - <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" /> - </set> - </option> - </component> -</project>
\ No newline at end of file diff --git a/lockchain-android/build.gradle b/lockchain-android/build.gradle deleted file mode 100644 index 2abf8e5..0000000 --- a/lockchain-android/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '1.2.21' - repositories { - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.2.0-alpha03' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - jcenter() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/lockchain-android/gradle.properties b/lockchain-android/gradle.properties deleted file mode 100644 index 743d692..0000000 --- a/lockchain-android/gradle.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true diff --git a/lockchain-android/gradle/wrapper/gradle-wrapper.jar b/lockchain-android/gradle/wrapper/gradle-wrapper.jar Binary files differdeleted file mode 100644 index 7a3265e..0000000 --- a/lockchain-android/gradle/wrapper/gradle-wrapper.jar +++ /dev/null diff --git a/lockchain-android/gradle/wrapper/gradle-wrapper.properties b/lockchain-android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index fd64213..0000000 --- a/lockchain-android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Mon Apr 02 14:59:17 CEST 2018 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip diff --git a/lockchain-android/gradlew b/lockchain-android/gradlew deleted file mode 100755 index cccdd3d..0000000 --- a/lockchain-android/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# 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 - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# 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 -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -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" -a "$nonstop" = "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 - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/lockchain-android/gradlew.bat b/lockchain-android/gradlew.bat deleted file mode 100644 index e95643d..0000000 --- a/lockchain-android/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@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=
-
-@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 Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_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=%*
-
-: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/lockchain-android/mobile/.gitignore b/lockchain-android/mobile/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/lockchain-android/mobile/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/lockchain-android/mobile/CMakeLists.txt b/lockchain-android/mobile/CMakeLists.txt deleted file mode 100644 index f8e6e8b..0000000 --- a/lockchain-android/mobile/CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ -# For more information about using CMake with Android Studio, read the -# documentation: https://d.android.com/studio/projects/add-native-code.html - -# Sets the minimum version of CMake required to build the native library. - -cmake_minimum_required(VERSION 3.4.1) - -# Creates and names a library, sets it as either STATIC -# or SHARED, and provides the relative paths to its source code. -# You can define multiple libraries, and CMake builds them for you. -# Gradle automatically packages shared libraries with your APK. - -add_library( # Sets the name of the library. - native-lib - - # Sets the library as a shared library. - SHARED - - # Provides a relative path to your source file(s). - src/main/cpp/native-lib.cpp ) - -# Searches for a specified prebuilt library and stores the path as a -# variable. Because CMake includes system libraries in the search path by -# default, you only need to specify the name of the public NDK library -# you want to add. CMake verifies that the library exists before -# completing its build. - -find_library( # Sets the name of the path variable. - log-lib - - # Specifies the name of the NDK library that - # you want CMake to locate. - log ) - -# Specifies libraries CMake should link to your target library. You -# can link multiple libraries, such as libraries you define in this -# build script, prebuilt third-party libraries, or system libraries. - -target_link_libraries( # Specifies the target library. - native-lib - - # Links the target library to the log library - # included in the NDK. - ${log-lib} )
\ No newline at end of file diff --git a/lockchain-android/mobile/build.gradle b/lockchain-android/mobile/build.gradle deleted file mode 100644 index 842fcf2..0000000 --- a/lockchain-android/mobile/build.gradle +++ /dev/null @@ -1,46 +0,0 @@ -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion 27 - defaultConfig { - applicationId "de.spacekookie.lockchain" - minSdkVersion 23 - targetSdkVersion 27 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - externalNativeBuild { - cmake { - cppFlags "-std=c++14 -frtti -fexceptions" - } - } - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - externalNativeBuild { - cmake { - path "CMakeLists.txt" - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:27.1.0' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' - implementation 'com.android.support:design:27.1.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - wearApp project(':wear') - implementation 'com.google.android.gms:play-services-wearable:+' -} diff --git a/lockchain-android/mobile/proguard-rules.pro b/lockchain-android/mobile/proguard-rules.pro deleted file mode 100644 index f1b4245..0000000 --- a/lockchain-android/mobile/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/lockchain-android/mobile/src/androidTest/java/de/spacekookie/lockchain/ExampleInstrumentedTest.kt b/lockchain-android/mobile/src/androidTest/java/de/spacekookie/lockchain/ExampleInstrumentedTest.kt deleted file mode 100644 index ac96add..0000000 --- a/lockchain-android/mobile/src/androidTest/java/de/spacekookie/lockchain/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package de.spacekookie.lockchain - -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getTargetContext() - assertEquals("de.spacekookie.lockchain", appContext.packageName) - } -} diff --git a/lockchain-android/mobile/src/main/AndroidManifest.xml b/lockchain-android/mobile/src/main/AndroidManifest.xml deleted file mode 100644 index 60ea5f9..0000000 --- a/lockchain-android/mobile/src/main/AndroidManifest.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="de.spacekookie.lockchain"> - - <uses-permission android:name="android.permission.WAKE_LOCK" /> - - <application - android:allowBackup="true" - android:icon="@mipmap/ic_launcher" - android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" - android:supportsRtl="true" - android:theme="@style/AppTheme"> - <activity - android:name=".MainActivity" - android:label="@string/app_name" - android:theme="@style/AppTheme.NoActionBar"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> - -</manifest>
\ No newline at end of file diff --git a/lockchain-android/mobile/src/main/cpp/native-lib.cpp b/lockchain-android/mobile/src/main/cpp/native-lib.cpp deleted file mode 100644 index fb14b32..0000000 --- a/lockchain-android/mobile/src/main/cpp/native-lib.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include <jni.h> -#include <string> - -extern "C" JNIEXPORT jstring - -JNICALL -Java_de_spacekookie_lockchain_MainActivity_stringFromJNI( - JNIEnv *env, - jobject /* this */) { - std::string hello = "Hello from C++"; - return env->NewStringUTF(hello.c_str()); -} diff --git a/lockchain-android/mobile/src/main/java/de/spacekookie/lockchain/MainActivity.kt b/lockchain-android/mobile/src/main/java/de/spacekookie/lockchain/MainActivity.kt deleted file mode 100644 index fefc9da..0000000 --- a/lockchain-android/mobile/src/main/java/de/spacekookie/lockchain/MainActivity.kt +++ /dev/null @@ -1,57 +0,0 @@ -package de.spacekookie.lockchain - -import android.os.Bundle -import android.support.design.widget.Snackbar -import android.support.v7.app.AppCompatActivity -import android.view.Menu -import android.view.MenuItem - -import kotlinx.android.synthetic.main.activity_main.* -import kotlinx.android.synthetic.main.fragment_main.* - -class MainActivity : AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - setSupportActionBar(toolbar) - - fab.setOnClickListener { view -> - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show() - } - - // Example of a call to a native method - sample_text.text = stringFromJNI() - } - - override fun onCreateOptionsMenu(menu: Menu): Boolean { - // Inflate the menu; this adds items to the action bar if it is present. - menuInflater.inflate(R.menu.menu_main, menu) - return true - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - return when (item.itemId) { - R.id.action_settings -> true - else -> super.onOptionsItemSelected(item) - } - } - - /** - * A native method that is implemented by the 'native-lib' native library, - * which is packaged with this application. - */ - external fun stringFromJNI(): String - - companion object { - - // Used to load the 'native-lib' library on application startup. - init { - System.loadLibrary("native-lib") - } - } -} diff --git a/lockchain-android/mobile/src/main/java/de/spacekookie/lockchain/MainActivityFragment.kt b/lockchain-android/mobile/src/main/java/de/spacekookie/lockchain/MainActivityFragment.kt deleted file mode 100644 index 56eae72..0000000 --- a/lockchain-android/mobile/src/main/java/de/spacekookie/lockchain/MainActivityFragment.kt +++ /dev/null @@ -1,18 +0,0 @@ -package de.spacekookie.lockchain - -import android.support.v4.app.Fragment -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup - -/** - * A placeholder fragment containing a simple view. - */ -class MainActivityFragment : Fragment() { - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle?): View? { - return inflater.inflate(R.layout.fragment_main, container, false) - } -} diff --git a/lockchain-android/mobile/src/main/res/drawable-v24/ic_launcher_foreground.xml b/lockchain-android/mobile/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c7bd21d..0000000 --- a/lockchain-android/mobile/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:aapt="http://schemas.android.com/aapt" - android:width="108dp" - android:height="108dp" - android:viewportHeight="108" - android:viewportWidth="108"> - <path - android:fillType="evenOdd" - android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" - android:strokeColor="#00000000" - android:strokeWidth="1"> - <aapt:attr name="android:fillColor"> - <gradient - android:endX="78.5885" - android:endY="90.9159" - android:startX="48.7653" - android:startY="61.0927" - android:type="linear"> - <item - android:color="#44000000" - android:offset="0.0" /> - <item - android:color="#00000000" - android:offset="1.0" /> - </gradient> - </aapt:attr> - </path> - <path - android:fillColor="#FFFFFF" - android:fillType="nonZero" - android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" - android:strokeColor="#00000000" - android:strokeWidth="1" /> -</vector> diff --git a/lockchain-android/mobile/src/main/res/drawable/ic_launcher_background.xml b/lockchain-android/mobile/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index d5fccc5..0000000 --- a/lockchain-android/mobile/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="108dp" - android:height="108dp" - android:viewportHeight="108" - android:viewportWidth="108"> - <path - android:fillColor="#26A69A" - android:pathData="M0,0h108v108h-108z" /> - <path - android:fillColor="#00000000" - android:pathData="M9,0L9,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,0L19,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M29,0L29,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M39,0L39,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M49,0L49,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M59,0L59,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M69,0L69,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M79,0L79,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M89,0L89,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M99,0L99,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,9L108,9" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,19L108,19" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,29L108,29" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,39L108,39" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,49L108,49" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,59L108,59" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,69L108,69" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,79L108,79" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,89L108,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,99L108,99" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,29L89,29" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,39L89,39" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,49L89,49" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,59L89,59" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,69L89,69" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,79L89,79" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M29,19L29,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M39,19L39,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M49,19L49,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M59,19L59,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M69,19L69,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M79,19L79,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> -</vector> diff --git a/lockchain-android/mobile/src/main/res/layout/activity_main.xml b/lockchain-android/mobile/src/main/res/layout/activity_main.xml deleted file mode 100644 index eed4d89..0000000 --- a/lockchain-android/mobile/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".MainActivity"> - - <android.support.design.widget.AppBarLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:theme="@style/AppTheme.AppBarOverlay"> - - <android.support.v7.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - app:popupTheme="@style/AppTheme.PopupOverlay" /> - - </android.support.design.widget.AppBarLayout> - - <include layout="@layout/content_main" /> - - <android.support.design.widget.FloatingActionButton - android:id="@+id/fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_margin="@dimen/fab_margin" - app:srcCompat="@android:drawable/ic_dialog_email" /> - -</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/lockchain-android/mobile/src/main/res/layout/content_main.xml b/lockchain-android/mobile/src/main/res/layout/content_main.xml deleted file mode 100644 index ae892ae..0000000 --- a/lockchain-android/mobile/src/main/res/layout/content_main.xml +++ /dev/null @@ -1,9 +0,0 @@ -<fragment xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/fragment" - android:name="de.spacekookie.lockchain.MainActivityFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior" - tools:layout="@layout/fragment_main" /> diff --git a/lockchain-android/mobile/src/main/res/layout/fragment_main.xml b/lockchain-android/mobile/src/main/res/layout/fragment_main.xml deleted file mode 100644 index a9e921c..0000000 --- a/lockchain-android/mobile/src/main/res/layout/fragment_main.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".MainActivityFragment" - tools:showIn="@layout/activity_main"> - - <TextView - android:id="@+id/sample_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Hello World!" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - -</android.support.constraint.ConstraintLayout>
\ No newline at end of file diff --git a/lockchain-android/mobile/src/main/res/menu/menu_main.xml b/lockchain-android/mobile/src/main/res/menu/menu_main.xml deleted file mode 100644 index d152077..0000000 --- a/lockchain-android/mobile/src/main/res/menu/menu_main.xml +++ /dev/null @@ -1,10 +0,0 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - tools:context="de.spacekookie.lockchain.MainActivity"> - <item - android:id="@+id/action_settings" - android:orderInCategory="100" - android:title="@string/action_settings" - app:showAsAction="never" /> -</menu> diff --git a/lockchain-android/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/lockchain-android/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> -</adaptive-icon>
\ No newline at end of file diff --git a/lockchain-android/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/lockchain-android/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> -</adaptive-icon>
\ No newline at end of file diff --git a/lockchain-android/mobile/src/main/res/mipmap-hdpi/ic_launcher.png b/lockchain-android/mobile/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differdeleted file mode 100644 index a2f5908..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-hdpi/ic_launcher.png +++ /dev/null diff --git a/lockchain-android/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png b/lockchain-android/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differdeleted file mode 100644 index 1b52399..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null diff --git a/lockchain-android/mobile/src/main/res/mipmap-mdpi/ic_launcher.png b/lockchain-android/mobile/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differdeleted file mode 100644 index ff10afd..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-mdpi/ic_launcher.png +++ /dev/null diff --git a/lockchain-android/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png b/lockchain-android/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differdeleted file mode 100644 index 115a4c7..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ /dev/null diff --git a/lockchain-android/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png b/lockchain-android/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differdeleted file mode 100644 index dcd3cd8..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null diff --git a/lockchain-android/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/lockchain-android/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differdeleted file mode 100644 index 459ca60..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ /dev/null diff --git a/lockchain-android/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png b/lockchain-android/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differdeleted file mode 100644 index 8ca12fe..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ /dev/null diff --git a/lockchain-android/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/lockchain-android/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differdeleted file mode 100644 index 8e19b41..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ /dev/null diff --git a/lockchain-android/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/lockchain-android/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differdeleted file mode 100644 index b824ebd..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ /dev/null diff --git a/lockchain-android/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/lockchain-android/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differdeleted file mode 100644 index 4c19a13..0000000 --- a/lockchain-android/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png +++ /dev/null diff --git a/lockchain-android/mobile/src/main/res/values/colors.xml b/lockchain-android/mobile/src/main/res/values/colors.xml deleted file mode 100644 index 3ab3e9c..0000000 --- a/lockchain-android/mobile/src/main/res/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <color name="colorPrimary">#3F51B5</color> - <color name="colorPrimaryDark">#303F9F</color> - <color name="colorAccent">#FF4081</color> -</resources> diff --git a/lockchain-android/mobile/src/main/res/values/dimens.xml b/lockchain-android/mobile/src/main/res/values/dimens.xml deleted file mode 100644 index 59a0b0c..0000000 --- a/lockchain-android/mobile/src/main/res/values/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ -<resources> - <dimen name="fab_margin">16dp</dimen> -</resources> diff --git a/lockchain-android/mobile/src/main/res/values/strings.xml b/lockchain-android/mobile/src/main/res/values/strings.xml deleted file mode 100644 index 7f9a0ef..0000000 --- a/lockchain-android/mobile/src/main/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ -<resources> - <string name="app_name">Lockchain</string> - <string name="action_settings">Settings</string> -</resources> diff --git a/lockchain-android/mobile/src/main/res/values/styles.xml b/lockchain-android/mobile/src/main/res/values/styles.xml deleted file mode 100644 index 545b9c6..0000000 --- a/lockchain-android/mobile/src/main/res/values/styles.xml +++ /dev/null @@ -1,20 +0,0 @@ -<resources> - - <!-- Base application theme. --> - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> - <!-- Customize your theme here. --> - <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimaryDark</item> - <item name="colorAccent">@color/colorAccent</item> - </style> - - <style name="AppTheme.NoActionBar"> - <item name="windowActionBar">false</item> - <item name="windowNoTitle">true</item> - </style> - - <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> - - <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> - -</resources> diff --git a/lockchain-android/mobile/src/test/java/de/spacekookie/lockchain/ExampleUnitTest.kt b/lockchain-android/mobile/src/test/java/de/spacekookie/lockchain/ExampleUnitTest.kt deleted file mode 100644 index 884d532..0000000 --- a/lockchain-android/mobile/src/test/java/de/spacekookie/lockchain/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package de.spacekookie.lockchain - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/lockchain-android/settings.gradle b/lockchain-android/settings.gradle deleted file mode 100644 index 6a4e79f..0000000 --- a/lockchain-android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':mobile', ':wear' diff --git a/lockchain-android/wear/.gitignore b/lockchain-android/wear/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/lockchain-android/wear/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/lockchain-android/wear/build.gradle b/lockchain-android/wear/build.gradle deleted file mode 100644 index e592df5..0000000 --- a/lockchain-android/wear/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion 27 - defaultConfig { - applicationId "de.spacekookie.lockchain" - minSdkVersion 23 - targetSdkVersion 27 - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - implementation 'com.google.android.support:wearable:2.3.0' - implementation 'com.google.android.gms:play-services-wearable:12.0.1' - implementation 'com.android.support:percent:27.1.0' - implementation 'com.android.support:support-v4:27.1.0' - implementation 'com.android.support:recyclerview-v7:27.1.0' - implementation 'com.android.support:wear:27.1.0' - compileOnly 'com.google.android.wearable:wearable:2.3.0' -} diff --git a/lockchain-android/wear/proguard-rules.pro b/lockchain-android/wear/proguard-rules.pro deleted file mode 100644 index f1b4245..0000000 --- a/lockchain-android/wear/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/lockchain-android/wear/src/main/AndroidManifest.xml b/lockchain-android/wear/src/main/AndroidManifest.xml deleted file mode 100644 index 2b02d59..0000000 --- a/lockchain-android/wear/src/main/AndroidManifest.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="de.spacekookie.lockchain"> - - <uses-feature android:name="android.hardware.type.watch" /> - - <uses-permission android:name="android.permission.WAKE_LOCK" /> - - <application - android:allowBackup="true" - android:icon="@mipmap/ic_launcher" - android:label="@string/app_name" - android:supportsRtl="true" - android:theme="@android:style/Theme.DeviceDefault"> - <uses-library - android:name="com.google.android.wearable" - android:required="true" /> - <!-- - Set to true if your app is Standalone, that is, it does not require the handheld - app to run. - --> - <meta-data - android:name="com.google.android.wearable.standalone" - android:value="true" /> - - <activity - android:name=".MainActivity" - android:label="@string/app_name"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> - -</manifest>
\ No newline at end of file diff --git a/lockchain-android/wear/src/main/java/de/spacekookie/lockchain/MainActivity.kt b/lockchain-android/wear/src/main/java/de/spacekookie/lockchain/MainActivity.kt deleted file mode 100644 index 9203265..0000000 --- a/lockchain-android/wear/src/main/java/de/spacekookie/lockchain/MainActivity.kt +++ /dev/null @@ -1,15 +0,0 @@ -package de.spacekookie.lockchain - -import android.os.Bundle -import android.support.wearable.activity.WearableActivity - -class MainActivity : WearableActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - - // Enables Always-on - setAmbientEnabled() - } -} diff --git a/lockchain-android/wear/src/main/res/layout/activity_main.xml b/lockchain-android/wear/src/main/res/layout/activity_main.xml deleted file mode 100644 index a5b02b2..0000000 --- a/lockchain-android/wear/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<android.support.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/dark_grey" - android:padding="@dimen/box_inset_layout_padding" - tools:context=".MainActivity" - tools:deviceIds="wear"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="@dimen/inner_frame_layout_padding" - app:boxedEdges="all"> - - <TextView - android:id="@+id/text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/hello_world" /> - - </FrameLayout> -</android.support.wear.widget.BoxInsetLayout>
\ No newline at end of file diff --git a/lockchain-android/wear/src/main/res/mipmap-hdpi/ic_launcher.png b/lockchain-android/wear/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differdeleted file mode 100644 index cde69bc..0000000 --- a/lockchain-android/wear/src/main/res/mipmap-hdpi/ic_launcher.png +++ /dev/null diff --git a/lockchain-android/wear/src/main/res/mipmap-mdpi/ic_launcher.png b/lockchain-android/wear/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differdeleted file mode 100644 index c133a0c..0000000 --- a/lockchain-android/wear/src/main/res/mipmap-mdpi/ic_launcher.png +++ /dev/null diff --git a/lockchain-android/wear/src/main/res/mipmap-xhdpi/ic_launcher.png b/lockchain-android/wear/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differdeleted file mode 100644 index bfa42f0..0000000 --- a/lockchain-android/wear/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null diff --git a/lockchain-android/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png b/lockchain-android/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differdeleted file mode 100644 index 324e72c..0000000 --- a/lockchain-android/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ /dev/null diff --git a/lockchain-android/wear/src/main/res/values-round/strings.xml b/lockchain-android/wear/src/main/res/values-round/strings.xml deleted file mode 100644 index 452e335..0000000 --- a/lockchain-android/wear/src/main/res/values-round/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ -<resources> - <string name="hello_world">Hello Round World!</string> -</resources> diff --git a/lockchain-android/wear/src/main/res/values/dimens.xml b/lockchain-android/wear/src/main/res/values/dimens.xml deleted file mode 100644 index e865b41..0000000 --- a/lockchain-android/wear/src/main/res/values/dimens.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <!-- - Because the window insets on round devices are larger than 15dp, this padding only applies - to square screens. - --> - <dimen name="box_inset_layout_padding">0dp</dimen> - - <!-- - This padding applies to both square and round screens. The total padding between the buttons - and the window insets is box_inset_layout_padding (above variable) on square screens and - inner_frame_layout_padding (below variable) on round screens. - --> - <dimen name="inner_frame_layout_padding">5dp</dimen> -</resources> diff --git a/lockchain-android/wear/src/main/res/values/strings.xml b/lockchain-android/wear/src/main/res/values/strings.xml deleted file mode 100644 index c4352d6..0000000 --- a/lockchain-android/wear/src/main/res/values/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ -<resources> - <string name="app_name">Lockchain</string> - <!-- - This string is used for square devices and overridden by hello_world in - values-round/strings.xml for round devices. - --> - <string name="hello_world">Hello Square World!</string> -</resources> diff --git a/lockchain-core/README.md b/lockchain-core/README.md index 32ebc7c..b79c82d 100644 --- a/lockchain-core/README.md +++ b/lockchain-core/README.md @@ -1,5 +1,11 @@ # lockchain-core +This library ecosystem is made of three main parts. + + - `lockchain-core` Common types shared between both `secret` and `default` operation modes. + - `lockchain-files` load vaults, decode files and work with encrypted streams. + - `lockchain-crypto` attach crypto handlers to vaults as a middleware to decrypt data. + If you're a Rust developer and interested in the `lockchain` crate, this README is for you. Lockchain is a document based, encrypted data vault. It provides you with an easy to use API to create, manage and update vaults and records. Build robust and user-friendly applications that deal with their data in a secure manner. Most notibly, this crate is being used by the [lockchain]() password manager as well as the [poke]() linux ssh key manager. diff --git a/lockchain-cli/Cargo.toml b/lockchain-core/lockchain-crypto/Cargo.toml index dd6e131..b598a42 100644 --- a/lockchain-cli/Cargo.toml +++ b/lockchain-core/lockchain-crypto/Cargo.toml @@ -1,8 +1,6 @@ [package] -name = "lockchain-cli" +name = "lockchain-crypto" version = "0.1.0" authors = ["Katharina Fey <kookie@spacekookie.de>"] [dependencies] -lockchain-core = { path = "../lockchain-core" } -clap = "*"
\ No newline at end of file diff --git a/lockchain-core/lockchain-crypto/src/lib.rs b/lockchain-core/lockchain-crypto/src/lib.rs new file mode 100644 index 0000000..31e1bb2 --- /dev/null +++ b/lockchain-core/lockchain-crypto/src/lib.rs @@ -0,0 +1,7 @@ +#[cfg(test)] +mod tests { + #[test] + fn it_works() { + assert_eq!(2 + 2, 4); + } +} diff --git a/lockchain-core/lockchain-files/Cargo.toml b/lockchain-core/lockchain-files/Cargo.toml new file mode 100644 index 0000000..f15d981 --- /dev/null +++ b/lockchain-core/lockchain-files/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "lockchain-files" +version = "0.1.0" +authors = ["Katharina Fey <kookie@spacekookie.de>"] + +[dependencies] diff --git a/lockchain-core/lockchain-files/src/lib.rs b/lockchain-core/lockchain-files/src/lib.rs new file mode 100644 index 0000000..31e1bb2 --- /dev/null +++ b/lockchain-core/lockchain-files/src/lib.rs @@ -0,0 +1,7 @@ +#[cfg(test)] +mod tests { + #[test] + fn it_works() { + assert_eq!(2 + 2, 4); + } +} diff --git a/lockchain-core/lockchain-files/src/vault.rs b/lockchain-core/lockchain-files/src/vault.rs new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/lockchain-core/lockchain-files/src/vault.rs diff --git a/lockchain-gtk/src/main.rs b/lockchain-gtk/src/main.rs deleted file mode 100644 index e7a11a9..0000000 --- a/lockchain-gtk/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, world!"); -} diff --git a/lockchain-gtk/Cargo.toml b/lockchain-http/Cargo.toml index e770da6..deb86fd 100644 --- a/lockchain-gtk/Cargo.toml +++ b/lockchain-http/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "lockchain-gtk" +name = "lockchain-http" version = "0.1.0" authors = ["Katharina Fey <kookie@spacekookie.de>"] diff --git a/lockchain-http/src/lib.rs b/lockchain-http/src/lib.rs new file mode 100644 index 0000000..31e1bb2 --- /dev/null +++ b/lockchain-http/src/lib.rs @@ -0,0 +1,7 @@ +#[cfg(test)] +mod tests { + #[test] + fn it_works() { + assert_eq!(2 + 2, 4); + } +} diff --git a/lockchain-server/Cargo.toml b/lockchain-server/Cargo.toml new file mode 100644 index 0000000..56d4f48 --- /dev/null +++ b/lockchain-server/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "lockchain-server" +version = "0.1.0" +authors = ["Katharina Fey <kookie@spacekookie.de>"] + +[dependencies] diff --git a/lockchain-cli/src/main.rs b/lockchain-server/src/main.rs index e7a11a9..e7a11a9 100644 --- a/lockchain-cli/src/main.rs +++ b/lockchain-server/src/main.rs |
