diff --git a/.gitignore b/.gitignore index 0ac83b3..f80cb4a 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,17 @@ proguard/ .idea/ .DS_Store + +.gradle + +.idea + +local.properties + +liteorm.iml + +library/library.iml +library/build + +sample/sample.iml +sample/build diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..9aa2e89 --- /dev/null +++ b/build.gradle @@ -0,0 +1,29 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + google() + jcenter() + maven { url "https://jitpack.io" } + maven { url 'https://dl.bintray.com/umsdk/release' } + } + dependencies { + classpath 'com.android.tools.build:gradle:4.0.0' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + maven { url "https://jitpack.io" } + maven { url 'https://dl.bintray.com/umsdk/release' } + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/library/build.gradle b/library/build.gradle new file mode 100644 index 0000000..f9d57ce --- /dev/null +++ b/library/build.gradle @@ -0,0 +1,41 @@ +apply plugin: "com.android.library" + +android { + compileSdkVersion rootProject.compileSdkVersion as int + buildToolsVersion rootProject.buildToolsVersion + + defaultConfig { + minSdkVersion rootProject.minSdkVersion as int + targetSdkVersion rootProject.targetSdkVersion as int + versionCode 1 + versionName "1.0" + } + + buildTypes { + debug { + minifyEnabled false + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" + } + + release { + minifyEnabled false + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + android.sourceSets { + main.jniLibs.srcDirs = ["libs/jniLibs"] + } +} + +dependencies { + api fileTree(dir: "libs", include: ["*.jar"]) + + api "net.zetetic:android-database-sqlcipher:4.4.0" + implementation "androidx.sqlite:sqlite:2.1.0" +} \ No newline at end of file diff --git a/library/AndroidManifest.xml b/library/src/main/AndroidManifest.xml similarity index 92% rename from library/AndroidManifest.xml rename to library/src/main/AndroidManifest.xml index 11e050d..f19028d 100644 --- a/library/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -4,8 +4,6 @@ android:versionCode="28" android:versionName="1.9.1"> - - diff --git a/library/src/com/litesuits/orm/LiteOrm.java b/library/src/main/java/com/litesuits/orm/LiteOrm.java similarity index 96% rename from library/src/com/litesuits/orm/LiteOrm.java rename to library/src/main/java/com/litesuits/orm/LiteOrm.java index c99e60f..b713300 100755 --- a/library/src/com/litesuits/orm/LiteOrm.java +++ b/library/src/main/java/com/litesuits/orm/LiteOrm.java @@ -16,13 +16,9 @@ package com.litesuits.orm; import android.content.Context; -import android.database.Cursor; -import android.database.sqlite.SQLiteClosable; -import android.database.sqlite.SQLiteDatabase; import com.litesuits.orm.db.DataBase; import com.litesuits.orm.db.DataBaseConfig; import com.litesuits.orm.db.TableManager; -import com.litesuits.orm.db.annotation.Check; import com.litesuits.orm.db.assit.*; import com.litesuits.orm.db.impl.CascadeSQLiteImpl; import com.litesuits.orm.db.impl.SingleSQLiteImpl; @@ -32,6 +28,10 @@ import com.litesuits.orm.db.utils.FieldUtil; import com.litesuits.orm.log.OrmLog; +import net.sqlcipher.Cursor; +import net.sqlcipher.database.SQLiteClosable; +import net.sqlcipher.database.SQLiteDatabase; + import java.io.File; import java.io.FileFilter; import java.util.*; @@ -332,7 +332,7 @@ public DataBaseConfig getDataBaseConfig() { @Override public SQLiteDatabase openOrCreateDatabase(String path, SQLiteDatabase.CursorFactory factory) { path = mConfig.context.getDatabasePath(mConfig.dbName).getPath(); - return SQLiteDatabase.openOrCreateDatabase(path, factory); + return SQLiteDatabase.openOrCreateDatabase(path, "pwd", factory); } @Override diff --git a/library/src/main/java/com/litesuits/orm/LiteOrmApplication.java b/library/src/main/java/com/litesuits/orm/LiteOrmApplication.java new file mode 100644 index 0000000..c7dec80 --- /dev/null +++ b/library/src/main/java/com/litesuits/orm/LiteOrmApplication.java @@ -0,0 +1,17 @@ +package com.litesuits.orm; + +import android.content.Context; + +import net.sqlcipher.database.SQLiteDatabase; + +public class LiteOrmApplication { + private static String mPwd; + public static void init(Context context, String pwd){ + SQLiteDatabase.loadLibs(context); + mPwd = pwd; + } + + public static String getPwd() { + return mPwd; + } +} diff --git a/library/src/com/litesuits/orm/db/DataBase.java b/library/src/main/java/com/litesuits/orm/db/DataBase.java similarity index 95% rename from library/src/com/litesuits/orm/db/DataBase.java rename to library/src/main/java/com/litesuits/orm/db/DataBase.java index b324a2e..fdf0eb5 100755 --- a/library/src/com/litesuits/orm/db/DataBase.java +++ b/library/src/main/java/com/litesuits/orm/db/DataBase.java @@ -15,7 +15,6 @@ */ package com.litesuits.orm.db; -import android.database.sqlite.SQLiteDatabase; import com.litesuits.orm.db.assit.QueryBuilder; import com.litesuits.orm.db.assit.WhereBuilder; import com.litesuits.orm.db.assit.SQLStatement; @@ -24,6 +23,8 @@ import com.litesuits.orm.db.model.ConflictAlgorithm; import com.litesuits.orm.db.model.RelationKey; +import net.sqlcipher.database.SQLiteDatabase; + import java.io.File; import java.util.ArrayList; import java.util.Collection; diff --git a/library/src/com/litesuits/orm/db/DataBaseConfig.java b/library/src/main/java/com/litesuits/orm/db/DataBaseConfig.java similarity index 100% rename from library/src/com/litesuits/orm/db/DataBaseConfig.java rename to library/src/main/java/com/litesuits/orm/db/DataBaseConfig.java diff --git a/library/src/com/litesuits/orm/db/TableManager.java b/library/src/main/java/com/litesuits/orm/db/TableManager.java similarity index 97% rename from library/src/com/litesuits/orm/db/TableManager.java rename to library/src/main/java/com/litesuits/orm/db/TableManager.java index 9ac85df..a1ac4b3 100755 --- a/library/src/com/litesuits/orm/db/TableManager.java +++ b/library/src/main/java/com/litesuits/orm/db/TableManager.java @@ -15,9 +15,6 @@ */ package com.litesuits.orm.db; - -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; import com.litesuits.orm.db.annotation.Column; import com.litesuits.orm.db.annotation.Mapping; import com.litesuits.orm.db.annotation.PrimaryKey; @@ -33,6 +30,9 @@ import com.litesuits.orm.db.utils.FieldUtil; import com.litesuits.orm.log.OrmLog; +import net.sqlcipher.Cursor; +import net.sqlcipher.database.SQLiteDatabase; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; diff --git a/library/src/com/litesuits/orm/db/annotation/Check.java b/library/src/main/java/com/litesuits/orm/db/annotation/Check.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/Check.java rename to library/src/main/java/com/litesuits/orm/db/annotation/Check.java diff --git a/library/src/com/litesuits/orm/db/annotation/Collate.java b/library/src/main/java/com/litesuits/orm/db/annotation/Collate.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/Collate.java rename to library/src/main/java/com/litesuits/orm/db/annotation/Collate.java diff --git a/library/src/com/litesuits/orm/db/annotation/Column.java b/library/src/main/java/com/litesuits/orm/db/annotation/Column.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/Column.java rename to library/src/main/java/com/litesuits/orm/db/annotation/Column.java diff --git a/library/src/com/litesuits/orm/db/annotation/Conflict.java b/library/src/main/java/com/litesuits/orm/db/annotation/Conflict.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/Conflict.java rename to library/src/main/java/com/litesuits/orm/db/annotation/Conflict.java diff --git a/library/src/com/litesuits/orm/db/annotation/Default.java b/library/src/main/java/com/litesuits/orm/db/annotation/Default.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/Default.java rename to library/src/main/java/com/litesuits/orm/db/annotation/Default.java diff --git a/library/src/com/litesuits/orm/db/annotation/Ignore.java b/library/src/main/java/com/litesuits/orm/db/annotation/Ignore.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/Ignore.java rename to library/src/main/java/com/litesuits/orm/db/annotation/Ignore.java diff --git a/library/src/com/litesuits/orm/db/annotation/MapCollection.java b/library/src/main/java/com/litesuits/orm/db/annotation/MapCollection.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/MapCollection.java rename to library/src/main/java/com/litesuits/orm/db/annotation/MapCollection.java diff --git a/library/src/com/litesuits/orm/db/annotation/Mapping.java b/library/src/main/java/com/litesuits/orm/db/annotation/Mapping.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/Mapping.java rename to library/src/main/java/com/litesuits/orm/db/annotation/Mapping.java diff --git a/library/src/com/litesuits/orm/db/annotation/NotNull.java b/library/src/main/java/com/litesuits/orm/db/annotation/NotNull.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/NotNull.java rename to library/src/main/java/com/litesuits/orm/db/annotation/NotNull.java diff --git a/library/src/com/litesuits/orm/db/annotation/PrimaryKey.java b/library/src/main/java/com/litesuits/orm/db/annotation/PrimaryKey.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/PrimaryKey.java rename to library/src/main/java/com/litesuits/orm/db/annotation/PrimaryKey.java diff --git a/library/src/com/litesuits/orm/db/annotation/Table.java b/library/src/main/java/com/litesuits/orm/db/annotation/Table.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/Table.java rename to library/src/main/java/com/litesuits/orm/db/annotation/Table.java diff --git a/library/src/com/litesuits/orm/db/annotation/Temporary.java b/library/src/main/java/com/litesuits/orm/db/annotation/Temporary.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/Temporary.java rename to library/src/main/java/com/litesuits/orm/db/annotation/Temporary.java diff --git a/library/src/com/litesuits/orm/db/annotation/Unique.java b/library/src/main/java/com/litesuits/orm/db/annotation/Unique.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/Unique.java rename to library/src/main/java/com/litesuits/orm/db/annotation/Unique.java diff --git a/library/src/com/litesuits/orm/db/annotation/UniqueCombine.java b/library/src/main/java/com/litesuits/orm/db/annotation/UniqueCombine.java similarity index 100% rename from library/src/com/litesuits/orm/db/annotation/UniqueCombine.java rename to library/src/main/java/com/litesuits/orm/db/annotation/UniqueCombine.java diff --git a/library/src/com/litesuits/orm/db/assit/Checker.java b/library/src/main/java/com/litesuits/orm/db/assit/Checker.java similarity index 100% rename from library/src/com/litesuits/orm/db/assit/Checker.java rename to library/src/main/java/com/litesuits/orm/db/assit/Checker.java diff --git a/library/src/com/litesuits/orm/db/assit/CollSpliter.java b/library/src/main/java/com/litesuits/orm/db/assit/CollSpliter.java similarity index 100% rename from library/src/com/litesuits/orm/db/assit/CollSpliter.java rename to library/src/main/java/com/litesuits/orm/db/assit/CollSpliter.java diff --git a/library/src/com/litesuits/orm/db/assit/Encrypt.java b/library/src/main/java/com/litesuits/orm/db/assit/Encrypt.java similarity index 100% rename from library/src/com/litesuits/orm/db/assit/Encrypt.java rename to library/src/main/java/com/litesuits/orm/db/assit/Encrypt.java diff --git a/library/src/com/litesuits/orm/db/assit/Querier.java b/library/src/main/java/com/litesuits/orm/db/assit/Querier.java similarity index 92% rename from library/src/com/litesuits/orm/db/assit/Querier.java rename to library/src/main/java/com/litesuits/orm/db/assit/Querier.java index 7e24dc4..7ab5878 100755 --- a/library/src/com/litesuits/orm/db/assit/Querier.java +++ b/library/src/main/java/com/litesuits/orm/db/assit/Querier.java @@ -1,9 +1,10 @@ package com.litesuits.orm.db.assit; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; import com.litesuits.orm.log.OrmLog; +import net.sqlcipher.Cursor; +import net.sqlcipher.database.SQLiteDatabase; + /** * 辅助查询 * diff --git a/library/src/com/litesuits/orm/db/assit/QueryBuilder.java b/library/src/main/java/com/litesuits/orm/db/assit/QueryBuilder.java similarity index 100% rename from library/src/com/litesuits/orm/db/assit/QueryBuilder.java rename to library/src/main/java/com/litesuits/orm/db/assit/QueryBuilder.java diff --git a/library/src/com/litesuits/orm/db/assit/SQLBuilder.java b/library/src/main/java/com/litesuits/orm/db/assit/SQLBuilder.java similarity index 100% rename from library/src/com/litesuits/orm/db/assit/SQLBuilder.java rename to library/src/main/java/com/litesuits/orm/db/assit/SQLBuilder.java diff --git a/library/src/com/litesuits/orm/db/assit/SQLStatement.java b/library/src/main/java/com/litesuits/orm/db/assit/SQLStatement.java similarity index 96% rename from library/src/com/litesuits/orm/db/assit/SQLStatement.java rename to library/src/main/java/com/litesuits/orm/db/assit/SQLStatement.java index 49eadb3..72b1f36 100755 --- a/library/src/com/litesuits/orm/db/assit/SQLStatement.java +++ b/library/src/main/java/com/litesuits/orm/db/assit/SQLStatement.java @@ -1,10 +1,6 @@ package com.litesuits.orm.db.assit; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteStatement; import android.os.Build; -import android.util.Log; import com.litesuits.orm.db.TableManager; import com.litesuits.orm.db.assit.Querier.CursorParser; import com.litesuits.orm.db.model.ColumnsValue; @@ -17,6 +13,10 @@ import com.litesuits.orm.db.utils.FieldUtil; import com.litesuits.orm.log.OrmLog; +import net.sqlcipher.Cursor; +import net.sqlcipher.database.SQLiteDatabase; +import net.sqlcipher.database.SQLiteStatement; + import java.io.IOException; import java.io.Serializable; import java.util.*; diff --git a/library/src/com/litesuits/orm/db/assit/SQLiteHelper.java b/library/src/main/java/com/litesuits/orm/db/assit/SQLiteHelper.java similarity index 54% rename from library/src/com/litesuits/orm/db/assit/SQLiteHelper.java rename to library/src/main/java/com/litesuits/orm/db/assit/SQLiteHelper.java index 37c5c1c..c07c267 100755 --- a/library/src/com/litesuits/orm/db/assit/SQLiteHelper.java +++ b/library/src/main/java/com/litesuits/orm/db/assit/SQLiteHelper.java @@ -1,9 +1,11 @@ package com.litesuits.orm.db.assit; import android.content.Context; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteDatabase.CursorFactory; -import android.database.sqlite.SQLiteOpenHelper; + +import com.litesuits.orm.LiteOrmApplication; + +import net.sqlcipher.database.SQLiteDatabase; +import net.sqlcipher.database.SQLiteOpenHelper; /** * SQLite辅助类 @@ -19,8 +21,8 @@ public static interface OnUpdateListener { private OnUpdateListener onUpdateListener; - public SQLiteHelper(Context context, String name, CursorFactory factory, int version, - OnUpdateListener onUpdateListener) { + public SQLiteHelper(Context context, String name, SQLiteDatabase.CursorFactory factory, int version, + OnUpdateListener onUpdateListener) { super(context, name, factory, version); this.onUpdateListener = onUpdateListener; } @@ -35,4 +37,11 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { } } + public synchronized SQLiteDatabase getWritableDatabase() { + return super.getWritableDatabase(LiteOrmApplication.getPwd()); + } + + public synchronized SQLiteDatabase getReadableDatabase() { + return super.getReadableDatabase(LiteOrmApplication.getPwd()); + } } \ No newline at end of file diff --git a/library/src/com/litesuits/orm/db/assit/Transaction.java b/library/src/main/java/com/litesuits/orm/db/assit/Transaction.java similarity index 92% rename from library/src/com/litesuits/orm/db/assit/Transaction.java rename to library/src/main/java/com/litesuits/orm/db/assit/Transaction.java index 7d6caf2..35fc28f 100755 --- a/library/src/com/litesuits/orm/db/assit/Transaction.java +++ b/library/src/main/java/com/litesuits/orm/db/assit/Transaction.java @@ -1,8 +1,9 @@ package com.litesuits.orm.db.assit; -import android.database.sqlite.SQLiteDatabase; import com.litesuits.orm.log.OrmLog; +import net.sqlcipher.database.SQLiteDatabase; + /** * 辅助事务 * diff --git a/library/src/com/litesuits/orm/db/assit/WhereBuilder.java b/library/src/main/java/com/litesuits/orm/db/assit/WhereBuilder.java similarity index 100% rename from library/src/com/litesuits/orm/db/assit/WhereBuilder.java rename to library/src/main/java/com/litesuits/orm/db/assit/WhereBuilder.java diff --git a/library/src/com/litesuits/orm/db/enums/AssignType.java b/library/src/main/java/com/litesuits/orm/db/enums/AssignType.java similarity index 100% rename from library/src/com/litesuits/orm/db/enums/AssignType.java rename to library/src/main/java/com/litesuits/orm/db/enums/AssignType.java diff --git a/library/src/com/litesuits/orm/db/enums/Relation.java b/library/src/main/java/com/litesuits/orm/db/enums/Relation.java similarity index 100% rename from library/src/com/litesuits/orm/db/enums/Relation.java rename to library/src/main/java/com/litesuits/orm/db/enums/Relation.java diff --git a/library/src/com/litesuits/orm/db/enums/Strategy.java b/library/src/main/java/com/litesuits/orm/db/enums/Strategy.java similarity index 100% rename from library/src/com/litesuits/orm/db/enums/Strategy.java rename to library/src/main/java/com/litesuits/orm/db/enums/Strategy.java diff --git a/library/src/com/litesuits/orm/db/impl/CascadeSQLiteImpl.java b/library/src/main/java/com/litesuits/orm/db/impl/CascadeSQLiteImpl.java similarity index 97% rename from library/src/com/litesuits/orm/db/impl/CascadeSQLiteImpl.java rename to library/src/main/java/com/litesuits/orm/db/impl/CascadeSQLiteImpl.java index aaa4837..ac5fa64 100755 --- a/library/src/com/litesuits/orm/db/impl/CascadeSQLiteImpl.java +++ b/library/src/main/java/com/litesuits/orm/db/impl/CascadeSQLiteImpl.java @@ -1,7 +1,5 @@ package com.litesuits.orm.db.impl; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; import com.litesuits.orm.LiteOrm; import com.litesuits.orm.db.DataBaseConfig; import com.litesuits.orm.db.TableManager; @@ -12,7 +10,9 @@ import com.litesuits.orm.db.utils.DataUtil; import com.litesuits.orm.db.utils.FieldUtil; -import java.io.IOException; +import net.sqlcipher.Cursor; +import net.sqlcipher.database.SQLiteDatabase; + import java.lang.reflect.Field; import java.util.*; diff --git a/library/src/com/litesuits/orm/db/impl/SingleSQLiteImpl.java b/library/src/main/java/com/litesuits/orm/db/impl/SingleSQLiteImpl.java similarity index 96% rename from library/src/com/litesuits/orm/db/impl/SingleSQLiteImpl.java rename to library/src/main/java/com/litesuits/orm/db/impl/SingleSQLiteImpl.java index bfc074d..b3feec7 100755 --- a/library/src/com/litesuits/orm/db/impl/SingleSQLiteImpl.java +++ b/library/src/main/java/com/litesuits/orm/db/impl/SingleSQLiteImpl.java @@ -1,6 +1,5 @@ package com.litesuits.orm.db.impl; -import android.database.sqlite.SQLiteDatabase; import com.litesuits.orm.LiteOrm; import com.litesuits.orm.db.DataBaseConfig; import com.litesuits.orm.db.TableManager; @@ -9,6 +8,8 @@ import com.litesuits.orm.db.model.ConflictAlgorithm; import com.litesuits.orm.db.model.EntityTable; +import net.sqlcipher.database.SQLiteDatabase; + import java.util.ArrayList; import java.util.Collection; diff --git a/library/src/com/litesuits/orm/db/model/ColumnsValue.java b/library/src/main/java/com/litesuits/orm/db/model/ColumnsValue.java similarity index 100% rename from library/src/com/litesuits/orm/db/model/ColumnsValue.java rename to library/src/main/java/com/litesuits/orm/db/model/ColumnsValue.java diff --git a/library/src/com/litesuits/orm/db/model/ConflictAlgorithm.java b/library/src/main/java/com/litesuits/orm/db/model/ConflictAlgorithm.java similarity index 100% rename from library/src/com/litesuits/orm/db/model/ConflictAlgorithm.java rename to library/src/main/java/com/litesuits/orm/db/model/ConflictAlgorithm.java diff --git a/library/src/com/litesuits/orm/db/model/EntityTable.java b/library/src/main/java/com/litesuits/orm/db/model/EntityTable.java similarity index 100% rename from library/src/com/litesuits/orm/db/model/EntityTable.java rename to library/src/main/java/com/litesuits/orm/db/model/EntityTable.java diff --git a/library/src/com/litesuits/orm/db/model/MapInfo.java b/library/src/main/java/com/litesuits/orm/db/model/MapInfo.java similarity index 100% rename from library/src/com/litesuits/orm/db/model/MapInfo.java rename to library/src/main/java/com/litesuits/orm/db/model/MapInfo.java diff --git a/library/src/com/litesuits/orm/db/model/MapProperty.java b/library/src/main/java/com/litesuits/orm/db/model/MapProperty.java similarity index 100% rename from library/src/com/litesuits/orm/db/model/MapProperty.java rename to library/src/main/java/com/litesuits/orm/db/model/MapProperty.java diff --git a/library/src/com/litesuits/orm/db/model/Primarykey.java b/library/src/main/java/com/litesuits/orm/db/model/Primarykey.java similarity index 100% rename from library/src/com/litesuits/orm/db/model/Primarykey.java rename to library/src/main/java/com/litesuits/orm/db/model/Primarykey.java diff --git a/library/src/com/litesuits/orm/db/model/Property.java b/library/src/main/java/com/litesuits/orm/db/model/Property.java similarity index 100% rename from library/src/com/litesuits/orm/db/model/Property.java rename to library/src/main/java/com/litesuits/orm/db/model/Property.java diff --git a/library/src/com/litesuits/orm/db/model/RelationKey.java b/library/src/main/java/com/litesuits/orm/db/model/RelationKey.java similarity index 100% rename from library/src/com/litesuits/orm/db/model/RelationKey.java rename to library/src/main/java/com/litesuits/orm/db/model/RelationKey.java diff --git a/library/src/com/litesuits/orm/db/model/SQLiteColumn.java b/library/src/main/java/com/litesuits/orm/db/model/SQLiteColumn.java similarity index 100% rename from library/src/com/litesuits/orm/db/model/SQLiteColumn.java rename to library/src/main/java/com/litesuits/orm/db/model/SQLiteColumn.java diff --git a/library/src/com/litesuits/orm/db/model/SQLiteTable.java b/library/src/main/java/com/litesuits/orm/db/model/SQLiteTable.java similarity index 100% rename from library/src/com/litesuits/orm/db/model/SQLiteTable.java rename to library/src/main/java/com/litesuits/orm/db/model/SQLiteTable.java diff --git a/library/src/com/litesuits/orm/db/utils/ClassUtil.java b/library/src/main/java/com/litesuits/orm/db/utils/ClassUtil.java similarity index 100% rename from library/src/com/litesuits/orm/db/utils/ClassUtil.java rename to library/src/main/java/com/litesuits/orm/db/utils/ClassUtil.java diff --git a/library/src/com/litesuits/orm/db/utils/DataUtil.java b/library/src/main/java/com/litesuits/orm/db/utils/DataUtil.java similarity index 100% rename from library/src/com/litesuits/orm/db/utils/DataUtil.java rename to library/src/main/java/com/litesuits/orm/db/utils/DataUtil.java diff --git a/library/src/com/litesuits/orm/db/utils/FieldUtil.java b/library/src/main/java/com/litesuits/orm/db/utils/FieldUtil.java similarity index 100% rename from library/src/com/litesuits/orm/db/utils/FieldUtil.java rename to library/src/main/java/com/litesuits/orm/db/utils/FieldUtil.java diff --git a/library/src/com/litesuits/orm/kvdb/DataCache.java b/library/src/main/java/com/litesuits/orm/kvdb/DataCache.java similarity index 100% rename from library/src/com/litesuits/orm/kvdb/DataCache.java rename to library/src/main/java/com/litesuits/orm/kvdb/DataCache.java diff --git a/library/src/com/litesuits/orm/kvdb/FileDataCahe.java b/library/src/main/java/com/litesuits/orm/kvdb/FileDataCahe.java similarity index 100% rename from library/src/com/litesuits/orm/kvdb/FileDataCahe.java rename to library/src/main/java/com/litesuits/orm/kvdb/FileDataCahe.java diff --git a/library/src/com/litesuits/orm/log/OrmLog.java b/library/src/main/java/com/litesuits/orm/log/OrmLog.java similarity index 100% rename from library/src/com/litesuits/orm/log/OrmLog.java rename to library/src/main/java/com/litesuits/orm/log/OrmLog.java diff --git a/sample/.settings/org.eclipse.jdt.core.prefs b/sample/.settings/org.eclipse.jdt.core.prefs deleted file mode 100755 index 48ab4c6..0000000 --- a/sample/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/sample/build.gradle b/sample/build.gradle new file mode 100644 index 0000000..ca56081 --- /dev/null +++ b/sample/build.gradle @@ -0,0 +1,37 @@ +apply plugin: "com.android.application" + +android { + compileSdkVersion rootProject.compileSdkVersion as int + buildToolsVersion rootProject.buildToolsVersion + + defaultConfig { + applicationId "com.litesuits.orm.samples" + minSdkVersion rootProject.minSdkVersion as int + targetSdkVersion rootProject.targetSdkVersion as int + versionCode rootProject.versionCode as int + versionName rootProject.versionName + } + + buildTypes { + debug { + minifyEnabled false + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", "proguard-fresco.pro" + } + + release { + minifyEnabled true + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", "proguard-fresco.pro" + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + +} + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation project(path: ":library") +} diff --git a/sample/libs/lite-orm-1.9.1.jar b/sample/libs/lite-orm-1.9.1.jar deleted file mode 100644 index a79a3df..0000000 Binary files a/sample/libs/lite-orm-1.9.1.jar and /dev/null differ diff --git a/sample/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml similarity index 92% rename from sample/AndroidManifest.xml rename to sample/src/main/AndroidManifest.xml index b3b1ce6..174ea20 100755 --- a/sample/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -4,9 +4,6 @@ android:versionCode="1" android:versionName="1.0"> - - @@ -14,6 +11,7 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" + android:name="com.litesuits.orm.Application" android:theme="@style/AppTheme">