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.

Sign up for GitHub

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

Jump to bottom

Release/2.5.3 simprints fork 2 #1

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Release/2.5.3 simprints fork 2 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed4148c
Remove the import of custom org.hisp.dhis:android-core lib
meladRaouf Oct 4, 2023
d768735
Bump version
meladRaouf Oct 4, 2023
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
5 changes: 4 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ android {
// excluding duplicate rxjava properties file
// see https://github.com/ReactiveX/RxJava/issues/4445#issuecomment-243591879
exclude 'META-INF/rxjava.properties'
exclude 'META-INF/core_release.kotlin_module'
exclude 'META-INF/LGPL2.1'

}

buildTypes {
Expand Down Expand Up @@ -177,7 +180,7 @@ android {
applicationId "org.simprints.dhis2"
dimension "default"
versionCode versions.vCode
versionName "2.5.2-simprints-fork-2"
versionName "2.5.3-simprints-fork-2"
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildsystem/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ ext {
sdk : 30,
tools : "30.0.3",
minSdk : 19,
vCode: 112,
vName: "2.5.2-simprints-fork-2"
vCode: 113,
vName: "2.5.3-simprints-fork-2"
]
libraries = [
//DHIS2
Expand Down
5 changes: 1 addition & 4 deletions commons/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ android {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])

debugApi project(':core')
releaseApi("org.hisp.dhis:android-core:${libraries.dhis2sdk}") {
exclude group: "org.hisp.dhis", module: "core-rules"
}
api project(':core')

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

Expand Down
4 changes: 2 additions & 2 deletions release.info
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
vName:2.5.2
vBranch:release/2.5.2
vName:2.5.3
vBranch:release/2.5.3
sdkVersion:1.5.3