modeled first commit of promise model

droid-forge · Aug 12, 2019 · 3ad09c6 · 3ad09c6
1 parent a7fbd20
commit 3ad09c6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,5 +11,14 @@
 .externalNativeBuild
 /app
 /appbase
-
+/commonsapp
+/dbapp
+/netapp
+/promise
+/promisecommons
+/promisedb
+/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/promisemodel/build.gradle b/promisemodel/build.gradle
@@ -40,13 +40,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$project.ext.kotlin_version"
     compileOnly 'androidx.appcompat:appcompat:1.0.2'
-    compileOnly project(path: ':promisecommons')
+    compileOnly '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'modelapp','promisemodel'
-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'modelapp','promisemodel'