Merge branch 'user-model/main' into fix/linting

jennantilla · jinliu9508 · commit ee1257506a35 · 2024-02-06T11:26:04.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,11 +29,6 @@ jobs:
         working-directory: OneSignalSDK
         run: |
           ./gradlew ktlintCheck --console=plain
-      - name: "[Test] Analyzing"
-        working-directory: OneSignalSDK
-        continue-on-error: true
-        run: |
-          ./gradlew detekt --console=plain
       - name: "[Test] SDK Unit Tests"
         working-directory: OneSignalSDK
         run: |
diff --git a/OneSignalSDK/build.gradle b/OneSignalSDK/build.gradle
@@ -15,9 +15,8 @@ buildscript {
         huaweiHMSLocationVersion = '4.0.0.300'
         kotlinVersion = '1.7.10'
         kotestVersion = '5.5.0'
-        ktlintPluginVersion = '11.6.1'
-        ktlintVersion = '1.0.1'
-        detektVersion = '1.21.0'
+        ktlintPluginVersion = '11.3.1'
+        ktlintVersion = '0.48.2'
         junitVersion = '4.13.2'
     }
 
@@ -34,7 +33,6 @@ buildscript {
         classpath "com.huawei.agconnect:agcp:$huaweiAgconnectVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlintPluginVersion"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"
     }
 }
 
diff --git a/OneSignalSDK/onesignal/core/build.gradle b/OneSignalSDK/onesignal/core/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'org.jlleitschuh.gradle.ktlint'
-    id 'io.gitlab.arturbosch.detekt'
 }
 
 android {
diff --git a/OneSignalSDK/onesignal/in-app-messages/build.gradle b/OneSignalSDK/onesignal/in-app-messages/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'org.jlleitschuh.gradle.ktlint'
-    id 'io.gitlab.arturbosch.detekt'
 }
 
 android {
diff --git a/OneSignalSDK/onesignal/location/build.gradle b/OneSignalSDK/onesignal/location/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'org.jlleitschuh.gradle.ktlint'
-    id 'io.gitlab.arturbosch.detekt'
 }
 
 android {
diff --git a/OneSignalSDK/onesignal/notifications/build.gradle b/OneSignalSDK/onesignal/notifications/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'org.jlleitschuh.gradle.ktlint'
-    id 'io.gitlab.arturbosch.detekt'
 }
 
 android {

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,8 @@ buildscript {`
`15`	`15`	`huaweiHMSLocationVersion = '4.0.0.300'`
`16`	`16`	`kotlinVersion = '1.7.10'`
`17`	`17`	`kotestVersion = '5.5.0'`
`18`		`- ktlintPluginVersion = '11.6.1'`
`19`		`- ktlintVersion = '1.0.1'`
`20`		`- detektVersion = '1.21.0'`
	`18`	`+ ktlintPluginVersion = '11.3.1'`
	`19`	`+ ktlintVersion = '0.48.2'`
`21`	`20`	`junitVersion = '4.13.2'`
`22`	`21`	`}`
`23`	`22`
`@@ -34,7 +33,6 @@ buildscript {`
`34`	`33`	`classpath "com.huawei.agconnect:agcp:$huaweiAgconnectVersion"`
`35`	`34`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"`
`36`	`35`	`classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlintPluginVersion"`
`37`		`- classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"`
`38`	`36`	`}`
`39`	`37`	`}`
`40`	`38`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ plugins {`
`2`	`2`	`id 'com.android.library'`
`3`	`3`	`id 'kotlin-android'`
`4`	`4`	`id 'org.jlleitschuh.gradle.ktlint'`
`5`		`- id 'io.gitlab.arturbosch.detekt'`
`6`	`5`	`}`
`7`	`6`
`8`	`7`	`android {`