Merge branch 'v2' into develop

WrBug · Sep 12, 2024 · b43d443 · b43d443
2 parents 15e7d43 + 034f0e9
commit b43d443
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -38,9 +38,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    dataBinding {
-        enabled = true
-    }
 }
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
@@ -56,13 +53,10 @@ dependencies {
     implementation 'com.elvishew:xlog:1.6.1'
     implementation 'org.jetbrains.anko:anko-commons:0.10.8'
     implementation 'com.airbnb.android:lottie:6.5.2'
-    //dagger2
-    implementation 'com.google.dagger:dagger:2.16'
     // https://mvnrepository.com/artifact/dom4j/dom4j
     implementation 'dom4j:dom4j:1.6.1'
     implementation 'com.evrencoskun.library:tableview:0.8.8'
     implementation 'gdut.bsx:share2:0.9.3'
-    kapt 'com.google.dagger:dagger-compiler:2.16'
     implementation 'de.blox:graphview:0.5.0'
     implementation "com.google.android.material:material:1.12.0"
     implementation project(':basemoduleimport')

diff --git a/app/src/main/java/com/wrbug/developerhelper/ui/activity/databaseedit/DatabaseEditActivity.kt b/app/src/main/java/com/wrbug/developerhelper/ui/activity/databaseedit/DatabaseEditActivity.kt
@@ -7,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.evrencoskun.tableview.listener.ITableViewListener
 import com.wrbug.developerhelper.R

diff --git a/app/src/main/java/com/wrbug/developerhelper/ui/activity/guide/GuideActivity.kt b/app/src/main/java/com/wrbug/developerhelper/ui/activity/guide/GuideActivity.kt
@@ -4,7 +4,6 @@ import android.animation.ArgbEvaluator
 import android.os.Bundle
 import android.view.View
 import androidx.core.content.ContextCompat
-import androidx.databinding.DataBindingUtil
 import androidx.viewpager.widget.ViewPager
 import com.wrbug.developerhelper.R
 import com.wrbug.developerhelper.basecommon.BaseActivity

diff --git a/app/src/main/java/com/wrbug/developerhelper/ui/activity/guide/GuideStepFragment.kt b/app/src/main/java/com/wrbug/developerhelper/ui/activity/guide/GuideStepFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
 import com.wrbug.developerhelper.R
 import com.wrbug.developerhelper.basecommon.BaseFragment
 import com.wrbug.developerhelper.databinding.FragmentGuideBinding

diff --git a/common.gradle b/common.gradle
@@ -7,6 +7,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    lintOptions {
+        baseline file("lint-baseline.xml")
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8