Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.2.5 #81

Merged
merged 9 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1
orbs:
gradle: circleci/gradle@2.2.0
android: circleci/android@2.1.2
android: circleci/android@2.3.0

jobs:
build-ui-test:
Expand All @@ -12,7 +12,7 @@ jobs:
steps:
- checkout
- restore_cache:
key: jars-{{ checksum "build.gradle" }}-{{ checksum "lib/build.gradle" }}
key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum "lib/build.gradle.kts" }}
- android/create-avd:
avd-name: testDevice
system-image: system-images;android-30;google_apis;x86
Expand All @@ -23,7 +23,7 @@ jobs:
restore-gradle-cache-prefix: v1a
post-emulator-launch-assemble-command: echo "Emulator Started"
- android/run-tests:
test-command: ./gradlew testing:jacocoTestReport
test-command: ./gradlew testing:connectedDebugAndroidTest
max-tries: 5
- store_test_results:
path: testing/build/outputs/androidTest-results
Expand All @@ -37,7 +37,7 @@ jobs:
steps:
- checkout
- restore_cache:
key: jars-{{ checksum "build.gradle" }}-{{ checksum "lib/build.gradle" }}
key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum "lib/build.gradle.kts" }}
- run:
name: Set Up
command: |
Expand All @@ -46,26 +46,22 @@ jobs:
- save_cache:
paths:
- ~/.gradle
key: jars-{{ checksum "build.gradle" }}-{{ checksum "lib/build.gradle" }}
key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum "lib/build.gradle.kts" }}
- run:
name: Run Tests
command: |
./gradlew lib:testDebugUnitTest
./gradlew lib:jacocoTestReport
- run:
name: Upload Coverage Report to SonarCloud
command: ./gradlew sonarqube
./gradlew lib:testDebugUnitTest
- store_test_results:
path: lib/build/test-results/testDebugUnitTest
deploy-to-sonatype:
docker:
- image: cimg/android:2023.05-browsers
environment:
JVM_OPTS: -Xmx3200m
executor:
name: android/android-machine
tag: 2023.05.1
resource-class: large
steps:
- checkout
- restore_cache:
key: jars-{{ checksum "build.gradle" }}-{{ checksum "lib/build.gradle" }}
key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum "lib/build.gradle.kts" }}
- run:
name: Set Up
command: |
Expand All @@ -74,7 +70,11 @@ jobs:
- save_cache:
paths:
- ~/.gradle
key: jars-{{ checksum "build.gradle" }}-{{ checksum "lib/build.gradle" }}
key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum "lib/build.gradle.kts" }}
- run:
name: Snapshot Release Check
command: |
echo -e "\nIS_SNAPSHOT_RELEASE=$( [[ "${CIRCLE_BRANCH}" =~ ^epic.* ]] && echo true || echo false )" >> gradle.properties
- run:
name: Inject Maven signing key
command: |
Expand Down Expand Up @@ -104,4 +104,5 @@ workflows:
filters:
branches:
only:
- staging
- staging
- /^epic.*/
70 changes: 0 additions & 70 deletions build.gradle

This file was deleted.

20 changes: 20 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
repositories {
mavenCentral()
google()
maven(url = "https://plugins.gradle.org/m2/")
}
}

plugins {
id("org.jetbrains.kotlin.android") version "1.8.20" apply false
id("com.android.application") version "8.5.0" apply false
id("org.jlleitschuh.gradle.ktlint") version "10.1.0" apply true
id("com.autonomousapps.dependency-analysis") version "1.20.0" apply true
}

tasks.register<Delete>("clean").configure {
delete(rootProject.layout.buildDirectory)
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
android.nonFinalResIds=false
LIBRARY_VERSION=3.2.5
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Nov 14 14:03:05 ICT 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
47 changes: 0 additions & 47 deletions jacoco.gradle

This file was deleted.

103 changes: 0 additions & 103 deletions lib/build.gradle

This file was deleted.

Loading