Fix: Make versioning consistent, particularly for the Kotlin compiler.

This commit is contained in:
Kevin Gorham 2021-04-23 15:00:45 -04:00
parent 5c57b0808f
commit bfde1b3c4c
No known key found for this signature in database
GPG Key ID: CCA55602DF49FC38
2 changed files with 60 additions and 8 deletions

View File

@ -6,7 +6,6 @@ project.version = config.publish.versionName
project.ext.POM_ARTIFACT_ID = config.publish.artifactId
buildscript {
ext.kotlinVersion = '1.4.31'
repositories {
mavenLocal()
google()
@ -20,14 +19,15 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30"
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.14"
//noinspection GradlePluginVersion
classpath "com.android.tools.build:gradle:_"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:_"
classpath "org.jetbrains.kotlin:kotlin-allopen:_"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:_"
classpath "com.google.protobuf:protobuf-gradle-plugin:_"
classpath 'com.github.str4d:rust-android-gradle:68b4ecc053'
classpath 'org.owasp:dependency-check-gradle:6.0.0'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
classpath 'org.owasp:dependency-check-gradle:_'
classpath 'com.vanniktech:gradle-maven-publish-plugin:_'
}
}
@ -123,6 +123,11 @@ android {
exclude 'META-INF/LICENSE.md'
exclude 'META-INF/LICENSE-notice.md'
}
configurations {
cleanedAnnotations
compile.exclude group: 'com.intellij' , module:'annotations'
compile.exclude group: 'org.jetbrains' , module:'annotations'
}
}
mavenPublish {
androidVariantToPublish = config.publish.target

View File

@ -61,3 +61,50 @@ version.org.junit.jupiter..junit-jupiter-migrationsupport=5.7.1
version.javax.annotation..javax.annotation-api=1.3.2
version.io.grpc..protoc-gen-grpc-java=1.37.0
plugin.android=4.1.3
## # available=4.2.0-alpha01
## # available=4.2.0-alpha02
## # available=4.2.0-alpha03
## # available=4.2.0-alpha04
## # available=4.2.0-alpha05
## # available=4.2.0-alpha06
## # available=4.2.0-alpha07
## # available=4.2.0-alpha08
## # available=4.2.0-alpha09
## # available=4.2.0-alpha10
## # available=4.2.0-alpha11
## # available=4.2.0-alpha12
## # available=4.2.0-alpha13
## # available=4.2.0-alpha14
## # available=4.2.0-alpha15
## # available=4.2.0-alpha16
## # available=4.2.0-beta01
## # available=4.2.0-beta02
## # available=4.2.0-beta03
## # available=4.2.0-beta04
## # available=4.2.0-beta05
## # available=4.2.0-beta06
## # available=4.2.0-rc01
## # available=7.0.0-alpha01
## # available=7.0.0-alpha02
## # available=7.0.0-alpha03
## # available=7.0.0-alpha04
## # available=7.0.0-alpha05
## # available=7.0.0-alpha06
## # available=7.0.0-alpha07
## # available=7.0.0-alpha08
## # available=7.0.0-alpha09
## # available=7.0.0-alpha10
## # available=7.0.0-alpha11
## # available=7.0.0-alpha12
## # available=7.0.0-alpha13
## # available=7.0.0-alpha14
version.org.jetbrains.dokka..dokka-gradle-plugin=1.4.32
version.com.google.protobuf..protobuf-gradle-plugin=0.8.16
version.org.owasp..dependency-check-gradle=6.1.5
version.com.vanniktech..gradle-maven-publish-plugin=0.14.2