Merge pull request #280 from lihenggui/mercury

Enable pretty print and encode default for blocker rules

.github/dependabot.yml

@@ -0,0 +1,25 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ - package-ecosystem: "gradle"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ registries: "*"
+ labels: [ "version update" ]
+ groups:
+ kotlin-ksp-compose:
+ patterns:
+ - "org.jetbrains.kotlin:*"
+ - "org.jetbrains.kotlin.jvm"
+ - "com.google.devtools.ksp"
+ - "androidx.compose.compiler:compiler"
+registries:
+ maven-google:
+ type: "maven-repository"
+ url: "https://maven.google.com"
+ replaces-base: true

.github/workflows/Build.yaml

@@ -134,6 +134,12 @@ jobs:
  name: lint-reports
  path: '**/build/reports/lint-results-*.html'
 
+ - name: Upload lint reports (SARIF)
+ if: always()
+ uses: github/codeql-action/upload-sarif@v2
+ with:
+ sarif_file: './'
+
  androidTest:
  needs: build
  runs-on: self-hosted

app-compose/src/main/java/com/merxury/blocker/BlockerApplication.kt

@@ -26,7 +26,6 @@ import com.merxury.blocker.core.data.respository.userdata.UserDataRepository
 import com.merxury.blocker.core.model.preference.RuleServerProvider.GITHUB
 import com.merxury.blocker.core.model.preference.RuleServerProvider.GITLAB
 import com.merxury.blocker.core.network.BlockerNetworkDataSource
-import com.merxury.blocker.sync.initializers.Sync
 import com.topjohnwu.superuser.Shell
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.MainScope
@@ -66,7 +65,7 @@ class BlockerApplication : Application(), ImageLoaderFactory, Configuration.Prov
  override fun onCreate() {
  super.onCreate()
  Timber.plant(Timber.DebugTree())
- Sync.initialize(context = this)
+// Sync.initialize(context = this)
  Shell.setDefaultBuilder(
  Shell.Builder.create()
  .setFlags(Shell.FLAG_REDIRECT_STDERR)

build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt

@@ -42,5 +42,6 @@ class AndroidLintConventionPlugin : Plugin<Project> {
 
 private fun Lint.configure() {
  xmlReport = true
+ sarifReport = true
  checkDependencies = true
 }