Gradle, libs update (#959)

* updates

* tests

* add ndk version

* fix

* fix

* fixes

* tests off

app/build.gradle

@@ -14,6 +14,8 @@ android {
     compileSdkVersion config["compile_sdk"]
     buildToolsVersion config["build_tools"]
 
+    ndkVersion "21.3.6528147"
+
     defaultConfig {
         applicationId config["application_id"]
         minSdkVersion config["min_sdk"]
@@ -65,6 +67,7 @@ android {
     androidExtensions {
         experimental = true
     }
+
 }
 
 ext {

app/src/main/java/com/anytypeio/anytype/ui/database/table/TableBoardFragment.kt

@@ -36,16 +36,17 @@ class DatabaseViewFragment : ViewStateFragment<ViewState<Table>>(R.layout.fragme
     override fun render(state: ViewState<Table>) {
         when (state) {
             is ViewState.Init -> {
-                tableView.adapter =
+                tableView.setAdapter(
                     TableAdapter(
                         requireContext()
                     )
+                )
                 vm.getDatabaseView(id = TEST_ID)
             }
 
             is ViewState.Success -> {
-                tableView.adapter.setColumnHeaderItems(state.data.column)
-                tableView.adapter.setCellItems(state.data.cell)
+                tableView.adapter?.setColumnHeaderItems(state.data.column)
+                tableView.adapter?.setCellItems(state.data.cell)
             }
         }
     }

app/src/main/java/com/anytypeio/anytype/ui/database/table/adapter/TableAdapter.kt

@@ -15,7 +15,7 @@ import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder
 const val VIEW_TYPE_DEFAULT = 0
 
 class TableAdapter(context: Context) :
-    AbstractTableAdapter<ColumnView, RowView, CellView>(context) {
+    AbstractTableAdapter<ColumnView, RowView, CellView>() {
 
     // -------------- Cell --------------------
 
@@ -77,14 +77,6 @@ class TableAdapter(context: Context) :
             }
         }
 
-    override fun onBindCellViewHolder(
-        holder: AbstractViewHolder?,
-        cellItemModel: Any?,
-        columnPosition: Int,
-        rowPosition: Int
-    ) {
-    }
-
     // -------------- Column --------------------
 
     override fun getColumnHeaderItemViewType(position: Int): Int =
@@ -161,35 +153,11 @@ class TableAdapter(context: Context) :
         }
     }
 
-    override fun onBindColumnHeaderViewHolder(
-        holder: AbstractViewHolder?,
-        columnHeaderItemModel: Any?,
-        columnPosition: Int
-    ) {
-    }
-
     // -------------- Row --------------------
 
     override fun getRowHeaderItemViewType(position: Int): Int =
         VIEW_TYPE_DEFAULT
 
-    override fun onBindRowHeaderViewHolder(
-        holder: AbstractViewHolder?,
-        rowHeaderItemModel: Any?,
-        rowPosition: Int
-    ) = Unit
-
-    override fun onCreateRowHeaderViewHolder(
-        parent: ViewGroup?,
-        viewType: Int
-    ): AbstractViewHolder {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun onCreateCornerView(): View {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
     companion object {
 
         val VIEW_TYPE_TITLE = 1
@@ -206,6 +174,39 @@ class TableAdapter(context: Context) :
         val VIEW_TYPE_PHONE = 12
         val VIEW_TYPE_NEW = 13
     }
+
+    override fun onBindCellViewHolder(
+        holder: AbstractViewHolder,
+        cellItemModel: CellView?,
+        columnPosition: Int,
+        rowPosition: Int
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun onBindColumnHeaderViewHolder(
+        holder: AbstractViewHolder,
+        columnHeaderItemModel: ColumnView?,
+        columnPosition: Int
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun onBindRowHeaderViewHolder(
+        holder: AbstractViewHolder,
+        rowHeaderItemModel: RowView?,
+        rowPosition: Int
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun onCreateRowHeaderViewHolder(parent: ViewGroup, viewType: Int): AbstractViewHolder {
+        TODO("Not yet implemented")
+    }
+
+    override fun onCreateCornerView(parent: ViewGroup): View {
+        TODO("Not yet implemented")
+    }
 }
 
 fun LayoutInflater.toView(id: Int, parent: ViewGroup): View = this.inflate(id, parent, false)

build.gradle

@@ -1,7 +1,7 @@
 apply from: './dependencies.gradle'
 
 buildscript {
-    ext.kotlin_version = '1.4.0'
+    ext.kotlin_version = '1.4.10'
     ext.gradle_tools = '3.1.3'
     ext.build_tools = '29.0.0'
     ext.nav_version = '2.3.0'
@@ -25,12 +25,12 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
-        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.google.gms:google-services:4.3.4'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.12"
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
     }
 }

dependencies.gradle

@@ -41,7 +41,7 @@ ext {
     gson_version = '2.8.6'
     rxrelay_version = '2.1.0'
     better_link_method_version = '2.2.0'
-    table_view_version = '0.8.8'
+    table_view_version = '0.8.9.2'
     rxbinding_version = '3.0.0'
     permission_disp_version = '4.6.0'
     pickt_version = "0.1.11"

gradle.properties

@@ -17,7 +17,6 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enableR8=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
-android.enableUnitTestBinaryResources=true
+kotlin.code.style=official

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Apr 13 21:05:02 MSK 2020
+#Wed Oct 07 17:40:32 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

lib-middleware/.gitignore

@@ -1 +0,0 @@
-/build

middleware-lib/.gitignore

@@ -0,0 +1,2 @@
+/build
+/lib.aar

middleware-lib/build.gradle

@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('lib.aar'))

middleware.sh

@@ -4,7 +4,7 @@ TOKEN=$1
 
 PROPERTY_PATH="middleware.path"
 PROPERTY_VERSION="middleware.version"
-LIBRARY_PATH="libs/lib.aar"
+LIBRARY_PATH="middleware-lib/lib.aar"
 
 REPO="anytypeio/go-anytype-middleware"
 FILE="lib.tar.gz"
@@ -39,8 +39,7 @@ printf "Done\n"
 
 printf "Preparing files\n"
 
-mkdir -p libs/
-mv /tmp/lib/lib.aar libs/
+mv /tmp/lib/lib.aar middleware-lib/
 
 rm -rf /tmp/lib
 rm -rf $FILE

middleware/build.gradle

@@ -26,11 +26,7 @@ android {
 
 dependencies {
 
-    def props = new Properties()
-    project.rootProject.file('configuration.properties').withDataInputStream { props.load(it) }
-    def libraryPath = project.rootProject.file(props.getProperty('middleware.path'))
-    implementation(files(libraryPath))
-
+    implementation project(':middleware-lib')
     implementation project(':protobuf')
     implementation project(':data')
 

settings.gradle

@@ -14,4 +14,5 @@ include ':app',
         ':library-emojifier',
         ':sample',
         ':clipboard',
-        ':analytics'
+        ':analytics',
+        ':middleware-lib'