initial commit into promise db

droid-forge · Aug 12, 2019 · 74f30da · 74f30da
1 parent c5c0b13
commit 74f30da
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,5 +11,15 @@
 .externalNativeBuild
 /app
 /appbase
+/commonsapp
+/modelapp
+/netapp
+/promise
+/promisecommons
+/promisemodel
+/promisenet
+/promisepref
+/promiseui
+/uiapp
 
 
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/build.gradle b/build.gradle
@@ -24,6 +24,7 @@ allprojects {
         maven {
             url "https://oss.sonatype.org/content/repositories/snapshots/"
         }
+        maven { url 'https://jitpack.io' }
     }
 }
 

diff --git a/dbapp/build.gradle b/dbapp/build.gradle
@@ -34,8 +34,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':promisedb')
-    implementation project(path: ':promisecommons')
-    implementation project(path: ':promiseui')
     implementation "com.android.support:recyclerview-v7:$supportLibVersion"
     implementation 'io.reactivex.rxjava2:rxjava:2.2.7'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'

diff --git a/dbapp/src/main/java/promise/dbapp/model/ComplexModel.kt b/dbapp/src/main/java/promise/dbapp/model/ComplexModel.kt
@@ -6,28 +6,8 @@ import android.view.View
 import promise.dbapp.R
 import promise.model.List
 import promise.model.SModel
-import promise.promiseui.model.Viewable
 
-class ComplexModel constructor() : SModel(), Parcelable, Viewable {
-  var index: Int = 0
-
-  override fun layout(): Int = R.layout.complex_layout
-
-  override fun init(view: View?) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-  }
-
-  override fun bind(view: View?) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-  }
-
-  override fun index(index: Int) {
-   this.index = index
-  }
-
-  override fun index(): Int {
-    return this.index
-  }
+class ComplexModel constructor() : SModel(), Parcelable {
 
   var intVariable: Int? = null
 

diff --git a/promisedb/build.gradle b/promisedb/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     compileOnly 'io.reactivex.rxjava2:rxjava:2.2.7'
     compileOnly 'androidx.appcompat:appcompat:1.0.2'
-    compileOnly project(path: ':promisecommons')
+    api 'com.github.android-promise:promise:commons-1.0-beta'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':promisecommons', ':commonsapp', 'dbapp', 'modelapp', 'netapp', 'promisedb', 'promisemodel', 'promisenet', 'promiseui', 'uiapp'
+include  'dbapp', 'promisedb'
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ allprojects { @@
             maven {
                 url "https://oss.sonatype.org/content/repositories/snapshots/"
             }
+            maven { url 'https://jitpack.io' }
         }
     }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':promisecommons', ':commonsapp', 'dbapp', 'modelapp', 'netapp', 'promisedb', 'promisemodel', 'promisenet', 'promiseui', 'uiapp'
		include 'dbapp', 'promisedb'