Skip to content

Commit d52b409

Browse files
Merge pull request #73 from Aditya-gupta99/fix_release
2 parents f6479ef + 6457a1b commit d52b409

File tree

6 files changed

+42
-23
lines changed

6 files changed

+42
-23
lines changed

app/build.gradle

+11-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion rootProject.ext.compileSdkVersion
5+
namespace 'org.mifos'
6+
compileSdk rootProject.ext.compileSdkVersion
67
buildToolsVersion rootProject.ext.buildToolsVersion
78

89
defaultConfig {
@@ -29,15 +30,19 @@ android {
2930
packagingOptions {
3031
exclude 'META-INF/core_release.kotlin_module'
3132
}
33+
compileOptions {
34+
sourceCompatibility JavaVersion.VERSION_17
35+
targetCompatibility JavaVersion.VERSION_17
36+
}
37+
kotlinOptions {
38+
jvmTarget = '17'
39+
}
3240

3341
}
3442

3543
dependencies {
36-
//implementation fileTree(dir: 'libs', include: ['*.jar'])
3744
implementation "androidx.multidex:multidex:$rootProject.multidexVersion"
38-
implementation ("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"){
39-
force true
40-
}
45+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
4146
implementation "androidx.appcompat:appcompat:$rootProject.appCompatVersion"
4247
testImplementation "junit:junit:$rootProject.jUnitVersion"
4348
androidTestImplementation "androidx.test.ext:junit:$rootProject.androidJUnitVersion"
@@ -64,7 +69,7 @@ dependencies {
6469
implementation "com.squareup.okhttp3:okhttp:$okHttp3Version"
6570
implementation "com.squareup.okhttp3:logging-interceptor:$okHttp3Version"
6671

67-
implementation project(path: ':core')
72+
implementation project(':core')
6873

6974
// fineract dependency
7075
implementation ("com.github.openMF:fineract-client:$fineractClientVersion")

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.2.2'
10+
classpath 'com.android.tools.build:gradle:8.1.0'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212

1313
// NOTE: Do not place your application dependencies here; they belong
@@ -53,7 +53,7 @@ ext {
5353
retrofitVersionLatest = '2.9.0'
5454

5555
// okHttp3 version
56-
okHttp3Version = '4.9.2'
56+
okHttp3Version = '4.11.0'
5757

5858
// preference version
5959
preference = '1.2.1'
@@ -62,7 +62,7 @@ ext {
6262
rxJavaVersion = '1.3.8'
6363

6464
// rxJavaAndroid version
65-
rxAndroidVersion = '1.1.0'
65+
rxAndroidVersion = '1.2.1'
6666

6767
// fineract version
6868
fineractClientVersion = '2.0.3'

core/build.gradle

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-kapt'
4+
apply plugin: 'maven-publish'
45

56
android {
6-
compileSdkVersion 33
7+
namespace 'org.mifos.core'
8+
compileSdk 33
79
buildToolsVersion "29.0.3"
810

911
defaultConfig {
@@ -26,10 +28,16 @@ android {
2628
packagingOptions {
2729
exclude 'META-INF/core_release.kotlin_module'
2830
}
31+
compileOptions {
32+
sourceCompatibility JavaVersion.VERSION_17
33+
targetCompatibility JavaVersion.VERSION_17
34+
}
35+
kotlinOptions {
36+
jvmTarget = '17'
37+
}
2938
}
3039

3140
dependencies {
32-
implementation fileTree(dir: 'libs', include: ['*.jar'])
3341
implementation "androidx.appcompat:appcompat:$rootProject.appCompatVersion"
3442
testImplementation "junit:junit:$rootProject.jUnitVersion"
3543
androidTestImplementation "androidx.test.ext:junit:$rootProject.androidJUnitVersion"
@@ -57,9 +65,23 @@ dependencies {
5765
implementation "com.squareup.okhttp3:logging-interceptor:$okHttp3Version"
5866

5967
//Shared Preferences dependency
60-
implementation "androidx.preference:preference:$preference"
68+
implementation "androidx.preference:preference-ktx:$preference"
6169

6270
// fineractClient dependency
6371
implementation ("com.github.openMF:fineract-client:$fineractClientVersion")
6472

6573
}
74+
75+
publishing {
76+
publications {
77+
release(MavenPublication) {
78+
groupId = 'com.github.openMF'
79+
artifactId = 'mifos-android-sdk-arch'
80+
version = '1.0.6'
81+
82+
afterEvaluate {
83+
from components.release
84+
}
85+
}
86+
}
87+
}

gradle.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9-
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 --add-opens java.base/java.io=ALL-UNNAMED
10-
# added --add-opens java.base/java.io=ALL-UNNAMED to resolve error module java.base does not "opens java.io" to unnamed module
9+
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
1110
# When configured, Gradle will run in incubating parallel mode.
1211
# This option should only be used with decoupled projects. More details, visit
1312
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip

jitpack.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
11
jdk:
2-
- openjdk17
3-
before_install:
4-
- sdk install java 17.0.3-tem
5-
- sdk use java 17.0.3-tem
6-
- sdk install maven
7-
- mvn -v
8-
install:
9-
- mvn install -Dmaven.javadoc.skip=true -DskipTests
2+
- openjdk17

0 commit comments

Comments
 (0)