Skip to content

Commit

Permalink
update gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
VREMSoftwareDevelopment committed Oct 18, 2024
1 parent 164aba4 commit 65a68a1
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
18 changes: 12 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,23 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/

apply plugin: "com.android.application"
plugins {
id "com.android.application"
id "kotlin-android"
id "kotlin-allopen"
id "jacoco"
}

apply from: "jacoco.gradle"
apply plugin: "kotlin-android"
apply plugin: "kotlin-allopen"
apply {
from "jacoco.gradle"
}

// dependencies -------------------------------------------------
dependencies {
// Compile Build Dependencies
implementation fileTree(include: ["*.jar"], dir: "libs")
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.annotation:annotation:1.8.2'
implementation 'androidx.annotation:annotation:1.9.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.collection:collection-ktx:1.4.4'
implementation 'androidx.core:core-ktx:1.13.1'
Expand All @@ -42,7 +47,7 @@ dependencies {
testImplementation 'androidx.test.ext:junit:1.2.1'
testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.14.1'
testImplementation 'org.mockito:mockito-core:5.14.2'
testImplementation 'org.mockito.kotlin:mockito-kotlin:5.4.0'
testImplementation 'org.robolectric:robolectric:4.13'
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
Expand Down Expand Up @@ -97,6 +102,7 @@ android {
unitTests {
includeAndroidResources true
all {
jvmArgs("-XX:+EnableDynamicAgentLoading")
testLogging {
events "passed", "skipped", "failed", "standardOut", "standardError"
outputs.upToDateWhen { false }
Expand Down
4 changes: 2 additions & 2 deletions app/build.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Build Properties
#Sat Oct 05 10:11:19 EDT 2024
version_build=6
#Fri Oct 18 08:48:43 EDT 2024
version_build=7
version_major=3
version_minor=1
version_patch=3
Expand Down
4 changes: 1 addition & 3 deletions app/jacoco.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/

apply plugin: "jacoco"

jacoco {
toolVersion = "0.8.11"
toolVersion = "0.8.12"
}

def executionPath = 'outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@

buildscript {
ext {
kotlin_version = '2.0.20'
kotlin_version = '2.0.21'
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.7.0'
classpath 'com.android.tools.build:gradle:8.7.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
}
Expand Down

0 comments on commit 65a68a1

Please sign in to comment.