Update Kotlin, Gradle and dependencies

pull/1140/head
Mattia Iavarone 4 years ago
parent 399844321b
commit 9d1306448e
  1. 24
      .github/workflows/build.yml
  2. 6
      .github/workflows/deploy.yml
  3. 6
      .github/workflows/snapshot.yml
  4. 8
      build.gradle.kts
  5. 25
      cameraview/build.gradle.kts
  6. 8
      demo/build.gradle.kts
  7. 3
      demo/src/main/AndroidManifest.xml
  8. 2
      gradle/wrapper/gradle-wrapper.properties

@ -12,9 +12,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
- uses: actions/setup-java@v2
with:
java-version: 1.8
java-version: 11
distribution: temurin
cache: gradle
- name: Perform base checks
run: ./gradlew demo:assembleDebug cameraview:publishToDirectory --stacktrace
ANDROID_UNIT_TESTS:
@ -22,9 +24,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
- uses: actions/setup-java@v2
with:
java-version: 1.8
java-version: 11
distribution: temurin
cache: gradle
- name: Execute unit tests
run: ./gradlew cameraview:runUnitTests --stacktrace
- name: Upload unit tests artifact
@ -58,9 +62,11 @@ jobs:
EMULATOR_ARCH: x86
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
- uses: actions/setup-java@v2
with:
java-version: 1.8
java-version: 11
distribution: temurin
cache: gradle
- name: Execute emulator tests
timeout-minutes: 30
uses: reactivecircus/android-emulator-runner@v2.2.0
@ -83,9 +89,11 @@ jobs:
needs: [ANDROID_UNIT_TESTS, ANDROID_EMULATOR_TESTS]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
- uses: actions/setup-java@v2
with:
java-version: 1.8
java-version: 11
distribution: temurin
cache: gradle
- name: Download unit tests artifact
uses: actions/download-artifact@v1
with:

@ -14,8 +14,10 @@ jobs:
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
- uses: actions/setup-java@v2
with:
java-version: 1.8
java-version: 11
distribution: temurin
cache: gradle
- name: Perform maven upload
run: ./gradlew publishToSonatype

@ -16,8 +16,10 @@ jobs:
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
- uses: actions/setup-java@v2
with:
java-version: 1.8
java-version: 11
distribution: temurin
cache: gradle
- name: Publish sonatype snapshot
run: ./gradlew publishToSonatypeSnapshot

@ -2,8 +2,8 @@
buildscript {
extra["minSdkVersion"] = 15
extra["compileSdkVersion"] = 30
extra["targetSdkVersion"] = 30
extra["compileSdkVersion"] = 31
extra["targetSdkVersion"] = 31
repositories {
google()
@ -11,9 +11,9 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:4.2.2")
classpath("com.android.tools.build:gradle:7.0.3")
classpath("io.deepmedia.tools:publisher:0.6.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
}
}

@ -10,23 +10,21 @@ plugins {
}
android {
setCompileSdkVersion(property("compileSdkVersion") as Int)
compileSdk = property("compileSdkVersion") as Int
defaultConfig {
setMinSdkVersion(property("minSdkVersion") as Int)
setTargetSdkVersion(property("targetSdkVersion") as Int)
versionCode = 1
versionName = "2.7.1"
minSdk = property("minSdkVersion") as Int
targetSdk = property("targetSdkVersion") as Int
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArgument("filter", "" +
testInstrumentationRunnerArguments["filter"] = "" +
"com.otaliastudios.cameraview.tools.SdkExcludeFilter," +
"com.otaliastudios.cameraview.tools.SdkIncludeFilter")
"com.otaliastudios.cameraview.tools.SdkIncludeFilter"
}
buildTypes["debug"].isTestCoverageEnabled = true
buildTypes["release"].isMinifyEnabled = false
}
dependencies {
testImplementation("junit:junit:4.13")
testImplementation("junit:junit:4.13.1")
testImplementation("org.mockito:mockito-inline:2.28.2")
androidTestImplementation("androidx.test:runner:1.4.0")
@ -35,7 +33,7 @@ dependencies {
androidTestImplementation("org.mockito:mockito-android:2.28.2")
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
api("androidx.exifinterface:exifinterface:1.3.2")
api("androidx.exifinterface:exifinterface:1.3.3")
api("androidx.lifecycle:lifecycle-common:2.3.1")
api("com.google.android.gms:play-services-tasks:17.2.1")
implementation("androidx.annotation:annotation:1.2.0")
@ -56,6 +54,7 @@ publisher {
project.addDeveloper("natario1", "mat.iavarone@gmail.com")
release.sources = Release.SOURCES_AUTO
release.docs = Release.DOCS_AUTO
release.version = "2.7.1"
directory()
@ -131,8 +130,8 @@ tasks.register("computeCoverage", JacocoReport::class) {
"**/com/otaliastudios/cameraview/filters/**.*"
)
})
reports.html.isEnabled = true
reports.xml.isEnabled = true
reports.html.destination = file("$coverageOutputDir/html")
reports.xml.destination = file("$coverageOutputDir/xml/report.xml")
reports.html.required.set(true)
reports.xml.required.set(true)
reports.html.outputLocation.set(file("$coverageOutputDir/html"))
reports.xml.outputLocation.set(file("$coverageOutputDir/xml/report.xml"))
}

@ -4,11 +4,11 @@ plugins {
}
android {
setCompileSdkVersion(property("compileSdkVersion") as Int)
compileSdk = property("compileSdkVersion") as Int
defaultConfig {
applicationId = "com.otaliastudios.cameraview.demo"
setMinSdkVersion(property("minSdkVersion") as Int)
setTargetSdkVersion(property("targetSdkVersion") as Int)
minSdk = property("minSdkVersion") as Int
targetSdk = property("targetSdkVersion") as Int
versionCode = 1
versionName = "1.0"
vectorDrawables.useSupportLibrary = true
@ -18,6 +18,6 @@ android {
dependencies {
implementation(project(":cameraview"))
implementation("androidx.appcompat:appcompat:1.3.0")
implementation("androidx.appcompat:appcompat:1.3.1")
implementation("com.google.android.material:material:1.4.0")
}

@ -16,7 +16,8 @@
<activity
android:name=".CameraActivity"
android:configChanges="screenLayout|keyboardHidden"
android:hardwareAccelerated="true">
android:hardwareAccelerated="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

Loading…
Cancel
Save