Merge pull request #19 from zeoflow/feature/deps

Bumped dependencies to new versions
zeoflow · Mar 24, 2022 · ea707f3 · ea707f3
2 parents 37df8ce + 2fb838a
commit ea707f3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ To use it:
 ```
 
 ## License
-    Copyright (C) 2021 ZeoFlow S.R.L.
+    Copyright (C) 2022 ZeoFlow S.R.L.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/app/build.gradle b/app/build.gradle
@@ -35,9 +35,12 @@ dependencies {
     implementation project(':dispatcher-runtime')
     annotationProcessor project(':dispatcher-compiler')
 
-    implementation('com.zeoflow:flow-kit:1.6.0')
+    implementation("com.zeoflow:startup:1.0.0")
+    implementation('com.zeoflow:flow-kit:1.6.2') {
+        exclude group: 'com.zeoflow', module: 'material-elements'
+    }
 
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 }
diff --git a/app/src/main/java/com/zeoflow/depot/db/WordDao.java b/app/src/main/java/com/zeoflow/depot/db/WordDao.java
@@ -58,4 +58,8 @@ public interface WordDao
     @Query("DELETE FROM word_table")
     void deleteAll();
 
+    @Query("SELECT COUNT(word) FROM word_table WHERE word=:word")
+    @Observable
+    LiveData<Integer> pagesRead(String word);
+
 }
diff --git a/gradle.properties b/gradle.properties
@@ -24,7 +24,7 @@ kotlin.code.style=official
 # Maven
 POM_NAME=Depot
 POM_PACKAGING=aar
-VERSION_NAME=1.0.3
+VERSION_NAME=1.0.4
 GROUP=com.zeoflow.depot
 POM_DESCRIPTION=The Depot persistence library provides an abstraction layer over SQLite to allow for more robust database access while using the full power of SQLite.
 POM_URL=https://github.com/zeoflow/depot

diff --git a/runtime/build.gradle b/runtime/build.gradle
@@ -15,9 +15,8 @@ dependencies {
     api(project(':depot-common'))
     api(project(":sqlite-framework"))
 
-    implementation('com.zeoflow:flow-kit:1.6.1') {
-        exclude group: 'com.zeoflow', module: 'material-elements'
-    }
+    implementation("com.zeoflow:startup:1.0.0")
+
     implementation("androidx.arch.core:core-runtime:2.0.1")
     compileOnly("androidx.paging:paging-common:2.0.0")
     compileOnly("androidx.lifecycle:lifecycle-livedata-core:2.0.0")

diff --git a/runtime/src/main/java/com/zeoflow/depot/Depot.java b/runtime/src/main/java/com/zeoflow/depot/Depot.java
@@ -21,7 +21,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 
-import com.zeoflow.initializer.ZeoFlowApp;
+import com.zeoflow.startup.AppInitializer;
 
 /**
  * Utility class for Depot.
@@ -55,7 +55,7 @@ public static <T extends DepotDatabase> DepotDatabase.Builder<T> databaseBuilder
                     + " If you are trying to create an in memory database, use Depot"
                     + ".inMemoryDatabaseBuilder");
         }
-        return new DepotDatabase.Builder<>(ZeoFlowApp.getContext(), klass, name);
+        return new DepotDatabase.Builder<>(AppInitializer.getAppContext(), klass, name);
     }
 
     /**