-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Kotlin, Gradle & Dependency Upgrades (#43)
* working version * Update some depencencies * Update CI Versions * Upgrade Mockito * update to gradle 7.4.0 * still updating stuff * Upgrade publish library --------- Co-authored-by: Efe Ejemudaro <Efe.Ejemudaro@vestiairecollective.com>
- Loading branch information
Showing
21 changed files
with
412 additions
and
353 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,24 @@ | ||
| name: ci | ||
|
|
||
| on: [push] | ||
| on: [ push ] | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Set up JDK 1.8 | ||
| uses: actions/setup-java@v1 | ||
| - name: set up JDK 17 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 1.8 | ||
| java-version: '17' | ||
| distribution: 'temurin' | ||
| cache: gradle | ||
|
|
||
| - name: Setup Android SDK | ||
| uses: android-actions/setup-android@v2 | ||
|
|
||
| - name: Build and Run Tests with Gradle | ||
| run: ./gradlew build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,7 @@ | ||
| apply from: './dependencies.gradle' | ||
|
|
||
| buildscript { | ||
| apply from: './dependencies.gradle' | ||
|
|
||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:' + versions.gradlePlugin | ||
| classpath "com.diffplug.spotless:spotless-plugin-gradle:" + versions.spotlessPlugin | ||
| classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:' + versions.kotlin | ||
| classpath 'com.vanniktech:gradle-maven-publish-plugin:' + versions.mavenPublishPlugin | ||
| } | ||
| plugins { | ||
| id 'com.android.application' version '8.0.1' apply false | ||
| id 'com.android.library' version '8.0.1' apply false | ||
| id 'org.jetbrains.kotlin.android' version '1.6.21' apply false | ||
| id "com.diffplug.spotless" version "6.12.0" | ||
| id "com.vanniktech.maven.publish" version "0.23.1" | ||
| } | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| tasks.withType(Javadoc).all { | ||
| enabled = false | ||
| } | ||
| } | ||
|
|
||
| task clean(type: Delete) { | ||
| delete rootProject.buildDir | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,12 @@ | ||
| ext.versions = [ | ||
| minSdk : 19, | ||
| compileSdk : 30, | ||
| buildTools : '30.0.2', | ||
| compileSdk : 33, | ||
| publishGroupID : 'com.cottacush', | ||
| publishArtifactID : 'CurrencyEditText', | ||
| publishVersion : '1.0.0', | ||
| publishVersionCode: 1, | ||
|
|
||
| gradlePlugin : '4.2.1', | ||
| spotlessPlugin : '4.0.0', | ||
| versionsPlugin : '0.21.0', | ||
| mavenPublishPlugin: '0.15.1', | ||
|
|
||
| kotlin : '1.3.40', | ||
| ktx : '1.0.2', | ||
| androidx : '1.0.2', | ||
|
|
||
| material : '1.1.0-alpha07', | ||
| ktx : '1.6.0', | ||
| androidx : '1.4.2', | ||
| material : '1.7.0', | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| #Sun Jun 30 19:33:56 WAT 2019 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip |
Oops, something went wrong.