diff --git a/settings.gradle b/settings.gradle index 2bdad68..da5e2b8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ include ':sorm' +include ':sorm-sample' diff --git a/sorm-sample/app/.gitignore b/sorm-sample/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/sorm-sample/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/sorm-sample/app/build.gradle b/sorm-sample/app/build.gradle deleted file mode 100644 index ef05666..0000000 --- a/sorm-sample/app/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" - - defaultConfig { - applicationId "com.example.sorm.sormexample" - minSdkVersion 15 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - buildConfigField "String", "PACKAGE_NAME", "\"com.example.sorm.sormexample\"" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'eu.livotov.labs.android:sorm:1.0.0' -} diff --git a/sorm-sample/build.gradle b/sorm-sample/build.gradle index e0b366a..57dd913 100644 --- a/sorm-sample/build.gradle +++ b/sorm-sample/build.gradle @@ -1,23 +1,29 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. +apply plugin: 'com.android.application' -buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' +android { + compileSdkVersion 23 + buildToolsVersion "23.0.2" - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + defaultConfig { + applicationId "com.example.sorm.sormexample" + minSdkVersion 15 + targetSdkVersion 23 + versionCode 1 + versionName "1.0" + buildConfigField "String", "PACKAGE_NAME", "\"com.example.sorm.sormexample\"" } -} -allprojects { - repositories { - jcenter() + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } } } -task clean(type: Delete) { - delete rootProject.buildDir +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile project(':sorm') + testCompile 'junit:junit:4.12' + compile 'com.android.support:appcompat-v7:23.1.1' } diff --git a/sorm-sample/gradle.properties b/sorm-sample/gradle.properties deleted file mode 100644 index 1d3591c..0000000 --- a/sorm-sample/gradle.properties +++ /dev/null @@ -1,18 +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. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# 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 \ No newline at end of file diff --git a/sorm-sample/gradle/wrapper/gradle-wrapper.properties b/sorm-sample/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index f23df6e..0000000 --- a/sorm-sample/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Oct 21 11:34:03 PDT 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip diff --git a/sorm-sample/app/proguard-rules.pro b/sorm-sample/proguard-rules.pro similarity index 100% rename from sorm-sample/app/proguard-rules.pro rename to sorm-sample/proguard-rules.pro diff --git a/sorm-sample/settings.gradle b/sorm-sample/settings.gradle deleted file mode 100644 index e7b4def..0000000 --- a/sorm-sample/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/sorm-sample/app/src/androidTest/java/com/example/sorm/sormexample/ApplicationTest.java b/sorm-sample/src/androidTest/java/com/example/sorm/sormexample/ApplicationTest.java similarity index 100% rename from sorm-sample/app/src/androidTest/java/com/example/sorm/sormexample/ApplicationTest.java rename to sorm-sample/src/androidTest/java/com/example/sorm/sormexample/ApplicationTest.java diff --git a/sorm-sample/app/src/main/AndroidManifest.xml b/sorm-sample/src/main/AndroidManifest.xml similarity index 100% rename from sorm-sample/app/src/main/AndroidManifest.xml rename to sorm-sample/src/main/AndroidManifest.xml diff --git a/sorm-sample/app/src/main/java/com/example/sorm/sormexample/Action.java b/sorm-sample/src/main/java/com/example/sorm/sormexample/Action.java similarity index 100% rename from sorm-sample/app/src/main/java/com/example/sorm/sormexample/Action.java rename to sorm-sample/src/main/java/com/example/sorm/sormexample/Action.java diff --git a/sorm-sample/app/src/main/java/com/example/sorm/sormexample/Card.java b/sorm-sample/src/main/java/com/example/sorm/sormexample/Card.java similarity index 100% rename from sorm-sample/app/src/main/java/com/example/sorm/sormexample/Card.java rename to sorm-sample/src/main/java/com/example/sorm/sormexample/Card.java diff --git a/sorm-sample/app/src/main/java/com/example/sorm/sormexample/DbUtils.java b/sorm-sample/src/main/java/com/example/sorm/sormexample/DbUtils.java similarity index 100% rename from sorm-sample/app/src/main/java/com/example/sorm/sormexample/DbUtils.java rename to sorm-sample/src/main/java/com/example/sorm/sormexample/DbUtils.java diff --git a/sorm-sample/app/src/main/java/com/example/sorm/sormexample/MainActivity.java b/sorm-sample/src/main/java/com/example/sorm/sormexample/MainActivity.java similarity index 100% rename from sorm-sample/app/src/main/java/com/example/sorm/sormexample/MainActivity.java rename to sorm-sample/src/main/java/com/example/sorm/sormexample/MainActivity.java diff --git a/sorm-sample/app/src/main/res/layout/activity_main.xml b/sorm-sample/src/main/res/layout/activity_main.xml similarity index 100% rename from sorm-sample/app/src/main/res/layout/activity_main.xml rename to sorm-sample/src/main/res/layout/activity_main.xml diff --git a/sorm-sample/app/src/main/res/mipmap-hdpi/ic_launcher.png b/sorm-sample/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from sorm-sample/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to sorm-sample/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/sorm-sample/app/src/main/res/mipmap-mdpi/ic_launcher.png b/sorm-sample/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from sorm-sample/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to sorm-sample/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/sorm-sample/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/sorm-sample/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from sorm-sample/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to sorm-sample/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/sorm-sample/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sorm-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from sorm-sample/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to sorm-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/sorm-sample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/sorm-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from sorm-sample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to sorm-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/sorm-sample/app/src/main/res/values/colors.xml b/sorm-sample/src/main/res/values/colors.xml similarity index 100% rename from sorm-sample/app/src/main/res/values/colors.xml rename to sorm-sample/src/main/res/values/colors.xml diff --git a/sorm-sample/app/src/main/res/values/strings.xml b/sorm-sample/src/main/res/values/strings.xml similarity index 100% rename from sorm-sample/app/src/main/res/values/strings.xml rename to sorm-sample/src/main/res/values/strings.xml diff --git a/sorm-sample/app/src/main/res/values/styles.xml b/sorm-sample/src/main/res/values/styles.xml similarity index 100% rename from sorm-sample/app/src/main/res/values/styles.xml rename to sorm-sample/src/main/res/values/styles.xml