Skip to content

Commit

Permalink
Merge branch 'master' of github.com:BTI-US/PhotoEditor
Browse files Browse the repository at this point in the history
  • Loading branch information
Phillweston committed May 8, 2024
2 parents 3cad7e1 + 07d5183 commit 9be5117
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
apply plugin: 'io.codearte.nexus-staging'

buildscript {
ext.kotlin_version = '1.8.10'
ext.kotlin_version = '1.9.23'

repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.3.2'
classpath "com.github.dcendents:android-maven-gradle-plugin:2.0"
classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

Expand Down
4 changes: 2 additions & 2 deletions photoeditor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ dependencies {

testImplementation 'androidx.test:core-ktx:1.5.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.9.2'
testImplementation 'org.robolectric:robolectric:4.12.1'

androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'

// Mockito
testImplementation 'org.mockito:mockito-core:5.1.1'
androidTestImplementation 'org.mockito:mockito-android:5.1.1'
androidTestImplementation 'org.mockito:mockito-android:5.11.0'
}

ext {
Expand Down

0 comments on commit 9be5117

Please sign in to comment.