Skip to content

Commit bbbd36a

Browse files
stephenbellangerstephenbellanger
authored
Merge pull request #9 from afaucogney/feature/fix_gradle
Fix gradle
2 parents 41ce3e4 + b8923d6 commit bbbd36a

File tree

5 files changed

+27
-124
lines changed

5 files changed

+27
-124
lines changed

Diff for: ‎build.gradle

+7-12
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
buildscript {
33
ext {
44
kotlinVersion = '1.5.31'
5-
6-
// Current lint target: Studio 4.2 / AGP 7
75
gradlePluginVersion = '7.0.3'
8-
lintVersion = '30.0.2'
6+
lintVersion = '30.0.3'
97
}
108
repositories {
119
google()
@@ -15,9 +13,6 @@ buildscript {
1513
classpath "com.android.tools.build:gradle:$gradlePluginVersion"
1614
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
1715

18-
// NOTE: Do not place your application dependencies here; they belong
19-
// in the individual module build.gradle files
20-
2116
// Jitpack
2217
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
2318
}
@@ -28,15 +23,15 @@ allprojects {
2823
mavenCentral()
2924
google()
3025
}
31-
32-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
33-
kotlinOptions {
34-
jvmTarget = JavaVersion.VERSION_11.toString()
35-
}
36-
}
3726
}
3827

3928
task clean(type: Delete) {
4029
delete rootProject.buildDir
4130
}
4231

32+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
33+
kotlinOptions {
34+
jvmTarget = "11"
35+
}
36+
}
37+

Diff for: ‎gradle.properties

-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,3 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
1717
android.useAndroidX=true
1818
# Kotlin code style for this project: "official" or "obsolete":
1919
kotlin.code.style=official
20-
# Fix Found more than one jar in the 'lintPublish' configuration.
21-
# kotlin.stdlib.default.dependency=false

Diff for: ‎gradle/wrapper/gradle-wrapper.properties

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri Mar 19 15:17:12 CET 2021
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

Diff for: ‎lint-kit-checks/build.gradle

+15-20
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,33 @@
11
plugins {
22
id 'java-library'
3-
id 'kotlin' // version $kotlinVersion
4-
//id 'com.android.lint'
3+
id 'kotlin'
54
}
65

76
java {
8-
sourceCompatibility = JavaVersion.VERSION_11
9-
targetCompatibility = JavaVersion.VERSION_11
7+
sourceCompatibility = JavaVersion.VERSION_1_8
8+
targetCompatibility = JavaVersion.VERSION_1_8
109
}
1110

1211
repositories {
1312
mavenCentral()
1413
google()
1514
}
16-
//7.02
17-
dependencies {
18-
// Lint
19-
compileOnly "com.android.tools.lint:lint-api:$lintVersion"
20-
compileOnly "com.android.tools.lint:lint-checks:$lintVersion"
21-
compileOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
2215

23-
// Fix Kotlin dep versions
16+
dependencies {
2417
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
25-
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
2618
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
19+
compileOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
20+
compileOnly "com.android.tools.lint:lint-api:$lintVersion"
21+
compileOnly "com.android.tools.lint:lint-checks:$lintVersion"
2722

28-
// Test
29-
testImplementation "com.android.tools:testutils:$lintVersion"
23+
testImplementation "com.android.tools.lint:lint:$lintVersion"
3024
testImplementation "com.android.tools.lint:lint-tests:$lintVersion"
25+
testImplementation "junit:junit:4.13.2"
3126
testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
32-
testImplementation "com.android.tools.lint:lint-api:$lintVersion"
33-
testImplementation "com.android.tools.lint:lint-checks:$lintVersion"
27+
}
3428

35-
// External lint libraries
36-
compileOnly 'com.vanniktech:lint-rules-android-lint:0.17.0'
37-
compileOnly 'com.vanniktech:lint-rules-rxjava2-lint:0.17.0'
38-
}
29+
jar {
30+
manifest {
31+
attributes('Lint-Registry-v2': 'fr.afaucogney.mobile.android.kit.lint.IssueRegistry')
32+
}
33+
}

Diff for: ‎lint-kit-checks/src/main/java/fr/afaucogney/mobile/android/kit/lint/IssueRegistry.kt

+3-87
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,15 @@
1+
@file:Suppress("UnstableAPIUSage") // We know that Lint API's aren't final.
2+
13
package fr.afaucogney.mobile.android.kit.lint
24

35
import com.android.tools.lint.client.api.IssueRegistry
46
import com.android.tools.lint.detector.api.CURRENT_API
57
import com.android.tools.lint.detector.api.Issue
6-
import com.vanniktech.lintrules.android.ISSUE_COLOR_CASING
7-
import com.vanniktech.lintrules.android.ISSUE_ERRONEOUS_LAYOUT_ATTRIBUTE
8-
import com.vanniktech.lintrules.android.ISSUE_INVALID_IMPORT
9-
import com.vanniktech.lintrules.android.ISSUE_INVALID_STRING
10-
import com.vanniktech.lintrules.android.ISSUE_LAYOUT_FILE_NAME_MATCHES_CLASS
11-
import com.vanniktech.lintrules.android.ISSUE_MATCHING_MENU_ID
12-
import com.vanniktech.lintrules.android.ISSUE_MISSING_SCROLLBARS
13-
import com.vanniktech.lintrules.android.ISSUE_MISSING_XML_HEADER
14-
import com.vanniktech.lintrules.android.ISSUE_NAMING_PATTERN
15-
import com.vanniktech.lintrules.android.ISSUE_RAW_COLOR
16-
import com.vanniktech.lintrules.android.ISSUE_RAW_DIMEN
17-
import com.vanniktech.lintrules.android.ISSUE_RESOURCES_GET_COLOR
18-
import com.vanniktech.lintrules.android.ISSUE_RESOURCES_GET_COLOR_STATE_LIST
19-
import com.vanniktech.lintrules.android.ISSUE_RESOURCES_GET_DRAWABLE
20-
import com.vanniktech.lintrules.android.ISSUE_SHOULD_USE_STATIC_IMPORT
21-
import com.vanniktech.lintrules.android.ISSUE_SUPERFLUOUS_MARGIN_DECLARATION
22-
import com.vanniktech.lintrules.android.ISSUE_SUPERFLUOUS_NAME_SPACE
23-
import com.vanniktech.lintrules.android.ISSUE_SUPERFLUOUS_PADDING_DECLARATION
24-
import com.vanniktech.lintrules.android.ISSUE_UNSUPPORTED_LAYOUT_ATTRIBUTE
25-
import com.vanniktech.lintrules.android.ISSUE_UNUSED_MERGE_ATTRIBUTES
26-
import com.vanniktech.lintrules.android.ISSUE_WRONG_ANNOTATION_ORDER
27-
import com.vanniktech.lintrules.android.ISSUE_WRONG_CONSTRAINT_LAYOUT_USAGE
28-
import com.vanniktech.lintrules.android.ISSUE_WRONG_DRAWABLE_NAME
29-
import com.vanniktech.lintrules.android.ISSUE_WRONG_GLOBAL_ICON_COLOR
30-
import com.vanniktech.lintrules.android.ISSUE_WRONG_LAYOUT_NAME
31-
import com.vanniktech.lintrules.android.ISSUE_WRONG_MENU_ID_FORMAT
32-
import com.vanniktech.lintrules.android.ISSUE_WRONG_VIEW_ID_FORMAT
33-
import com.vanniktech.lintrules.android.ISSUE_XML_SPACING
34-
import com.vanniktech.lintrules.rxjava2.ISSUE_DEFAULT_SCHEDULER
35-
import com.vanniktech.lintrules.rxjava2.ISSUE_METHOD_MISSING_CHECK_RETURN_VALUE
368
import fr.afaucogney.mobile.android.kit.lint.rules.common.WellSeparatorDetector
37-
import fr.afaucogney.mobile.android.kit.lint.rules.contract.NotEnoughtFeatureContractInterfaceSegregationDetector
38-
import fr.afaucogney.mobile.android.kit.lint.rules.contract.ViewModelContractExposeMutableLiveDataDetector
39-
import fr.afaucogney.mobile.android.kit.lint.rules.contract.ViewModelExposedTypeIsNotLiveDataDetector
40-
import fr.afaucogney.mobile.android.kit.lint.rules.contract.ViewModelMethodParameterIsCallbackDetector
41-
import fr.afaucogney.mobile.android.kit.lint.rules.contract.WrongFeatureContractNamingDetector
42-
import fr.afaucogney.mobile.android.kit.lint.rules.contract.WrongViewCapabilitiesApiINamingDetector
43-
import fr.afaucogney.mobile.android.kit.lint.rules.contract.WrongViewEventApiINamingDetector
44-
import fr.afaucogney.mobile.android.kit.lint.rules.contract.WrongViewModelApiNamingDetector
45-
import fr.afaucogney.mobile.android.kit.lint.rules.contract.WrongViewNavigationApiINamingDetector
46-
import fr.afaucogney.mobile.android.kit.lint.rules.contract.WrongViewTagApiNamingDetector
9+
import fr.afaucogney.mobile.android.kit.lint.rules.contract.*
4710
import fr.afaucogney.mobile.android.kit.lint.rules.depreciation.AutodisposeStillImportedDetector
4811
import fr.afaucogney.mobile.android.kit.lint.rules.xml.WrongViewIdNameDetector
4912

50-
@Suppress("UnstableApiUsage")
5113
class IssueRegistry : IssueRegistry() {
5214

5315
///////////////////////////////////////////////////////////////////////////
@@ -88,51 +50,5 @@ class IssueRegistry : IssueRegistry() {
8850
// Architecture
8951

9052
// Android-Lint
91-
92-
// Resources
93-
ISSUE_RAW_COLOR,
94-
ISSUE_RAW_DIMEN,
95-
ISSUE_COLOR_CASING,
96-
ISSUE_INVALID_STRING,
97-
ISSUE_INVALID_IMPORT,
98-
ISSUE_RESOURCES_GET_COLOR,
99-
ISSUE_RESOURCES_GET_DRAWABLE,
100-
ISSUE_RESOURCES_GET_COLOR_STATE_LIST,
101-
102-
// Layout
103-
ISSUE_ERRONEOUS_LAYOUT_ATTRIBUTE,
104-
ISSUE_LAYOUT_FILE_NAME_MATCHES_CLASS,
105-
ISSUE_MISSING_SCROLLBARS,
106-
ISSUE_SUPERFLUOUS_MARGIN_DECLARATION,
107-
ISSUE_SUPERFLUOUS_PADDING_DECLARATION,
108-
ISSUE_UNSUPPORTED_LAYOUT_ATTRIBUTE,
109-
ISSUE_UNUSED_MERGE_ATTRIBUTES,
110-
ISSUE_WRONG_CONSTRAINT_LAYOUT_USAGE,
111-
ISSUE_WRONG_VIEW_ID_FORMAT,
112-
113-
// Menu
114-
ISSUE_MATCHING_MENU_ID,
115-
ISSUE_WRONG_MENU_ID_FORMAT,
116-
117-
// Files
118-
ISSUE_SUPERFLUOUS_NAME_SPACE,
119-
ISSUE_MISSING_XML_HEADER,
120-
ISSUE_WRONG_DRAWABLE_NAME,
121-
ISSUE_XML_SPACING,
122-
123-
// Naming
124-
ISSUE_NAMING_PATTERN,
125-
ISSUE_WRONG_LAYOUT_NAME,
126-
127-
// Clearness
128-
ISSUE_SHOULD_USE_STATIC_IMPORT,
129-
ISSUE_WRONG_ANNOTATION_ORDER,
130-
131-
// Performance
132-
ISSUE_WRONG_GLOBAL_ICON_COLOR,
133-
134-
// RxJava Vannitech
135-
ISSUE_METHOD_MISSING_CHECK_RETURN_VALUE,
136-
ISSUE_DEFAULT_SCHEDULER,
13753
)
13854
}

0 commit comments

Comments
 (0)