Skip to content

Commit

Permalink
Merge pull request #57 from Beldex-Coin/dev
Browse files Browse the repository at this point in the history 
Released version 2.5.3 (67)
  • Loading branch information
@codeman-crypto
codeman-crypto authored Sep 24, 2024
2 parents dcccd93 + a7b0b0a commit 656615a
Show file tree
Hide file tree
Showing 1,017 changed files with 15,553 additions and 13,797 deletions.
112 changes: 8 additions & 104 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,104 +11,8 @@ apply from: 'buildGradle/dependencies.gradle'
configurations.all {
exclude module: "commons-logging"
}
def canonicalVersionCode = 46
def canonicalVersionName = "2.5.1"

//First Release Date 17-06-2022
//Version Code 15 Version Name 1.0.0

//Second Release Date 19-06-2022
//Version Code 16 Version Name 1.0.1

//Third Release Date 20-06-2022
//Version Code 17 Version Name 1.0.2

//Fourth Release Date 28-06-2022
//Version Code 18 Version Name 1.0.3

//Fifth Release Date 04-07-2022
//Version Code 19 Version Name 1.0.4

//Six Internal Test Release Date 26-07-2022
//Version Code 20 Version Name 1.1.0

//Seventh Internal Test Release Date 27-07-2022
//Version Code 21 Version Name 1.1.1

//Eighth Release Date 26-09-2022
//Version Code 22 Version Name 1.2.0

//Ninth Release Date 05-10-2022
//Version Code 23 Version Name 1.2.1

//Tenth Internal Test Release Date 28-12-2022
//Version Code 24 Version Name 1.2.2

//Eleventh Internal Test Release Date 29-12-2022
//Version Code 25 Version Name 1.2.3

//Twelveth Internal Test Release Date 04-01-2023
//Version Code 26 Version Name 1.2.4

//Thirteenth Internal Test Release Date 04-01-2023
//Version Code 27 Version Name 1.2.5

//Fourteenth Internal Test Release Date 16-01-2023
//Version Code 28 Version Name 2.0.0

//Fifteenth Release Date 06-02-2023
//Version Code 29 Version Name 2.0.1

//Sixteenth Release Date 09-02-2023
//Version Code 30 Version Name 2.0.2

//Seventeenth Release Date 27-02-2023
//Version Code 31 Version Name 2.0.3

//Eighteenth Release Date 31-03-2023
//Version Code 32 Version Name 2.0.4

//Nineteenth Release Data 06-07-2023
//Version Code 33 Version Name 2.1.0

//Twentieth Release Date 29-08-2023
//Version Code 34 Version Name 2.1.1

//Twenty-first Release Date 15-11-2023
//Version Code 35 Version Name 2.2.0

//Twenty-second Release Data 21-12-2023
//Version code 36 Version Name 2.2.1

//Twenty-third Release Data 03-01-2024
//Version code 37 Version Name 2.2.2

//Twenty-fourth Internal Test Release Data 29-01-2024
//Version code 38 Version Name 2.2.3

//Twenty-fifth Release Data 30-01-2024 (Rejected)
//Version code 39 Version Name 2.3.0

//Twenty-sixth Release Data 31-01-2024
//Version code 40 Version Name 2.3.0

//Twenty-seventh Release Data 22-02-2024
//Version code 41 Version Name 2.4.0

//Twenty-eight Internal Test Release Data 05-03-2024
//Version code 42 Version Name 2.4.1

//Twenty-ninth Test Release Data 22-03-2024
//Version code 43 Version Name 2.5.0

//30th Release Data 22-03-2024
//Version code 44 Version Name 2.5.0

//31th Internal Test Release Data 22-03-2024
//Version code 45 Version Name 2.5.0

//32 Internal Test Release Data 27-05-2024
//Version code 46 Version Name 2.5.1
def canonicalVersionCode = 67
def canonicalVersionName = "2.5.3"

def postFixSize = 10
def abiPostFix = ['armeabi-v7a' : 1,
Expand All @@ -120,12 +24,12 @@ android {
useLibrary 'org.apache.http.legacy'

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '17'
jvmTarget = '1.8'
freeCompilerArgs += [
"-Xjvm-default=all",
]
Expand Down Expand Up @@ -222,15 +126,15 @@ android {
dimension "targetNet"

buildConfigField "String", "NETWORK_TYPE", "\"mainnet\""
buildConfigField "String", "REPORT_ISSUE_ID", "\"bdb890a974a25ef50c64cc4e3270c4c49c7096c433b8eecaf011c1ad000e426813\""
buildConfigField "String", "REPORT_ISSUE_ID", "\"bd27b58b7cfc65df45d1632c37609cdf3414040e2330b1814ec8fff2087d863952\""
buildConfigField "boolean", "USE_TESTNET", "false"
buildConfigField "String", "EXPLORER_URL", "\"https://explorer.beldex.io\""
}
devNet {
dimension "targetNet"

buildConfigField "String", "NETWORK_TYPE", "\"devnet\""
buildConfigField "String", "REPORT_ISSUE_ID", "\"bd21c8c3179975fa082f221323ae47d44bf38b8f6e39f530c2d07ce7ad4892682d\""
buildConfigField "String", "REPORT_ISSUE_ID", "\"bd27b58b7cfc65df45d1632c37609cdf3414040e2330b1814ec8fff2087d863952\""
buildConfigField "boolean", "USE_TESTNET", "true"
buildConfigField "String", "EXPLORER_URL", "\"http://154.26.139.105\""
}
Expand Down Expand Up @@ -261,7 +165,7 @@ android {
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.4.1"
kotlinCompilerExtensionVersion = "1.4.7"
}
externalNativeBuild {
cmake {
Expand Down
78 changes: 35 additions & 43 deletions app/buildGradle/dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,49 +15,44 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
implementation "androidx.paging:paging-runtime-ktx:$pagingVersion"
implementation 'androidx.activity:activity-ktx:1.7.2'
implementation 'androidx.fragment:fragment-ktx:1.6.1'
implementation 'androidx.activity:activity-ktx:1.5.1'
implementation 'androidx.fragment:fragment-ktx:1.5.3'
implementation "androidx.core:core-ktx:$coreVersion"
implementation "androidx.work:work-runtime-ktx:2.8.1"
implementation ("com.google.firebase:firebase-messaging:23.2.1") {
implementation "androidx.work:work-runtime-ktx:2.7.1"
implementation ("com.google.firebase:firebase-messaging:24.0.0") {
exclude group: 'com.google.firebase', module: 'firebase-core'
exclude group: 'com.google.firebase', module: 'firebase-analytics'
exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
}
implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
implementation 'androidx.media3:media3-exoplayer:1.4.0'
implementation 'androidx.media3:media3-ui:1.4.0'
implementation 'org.conscrypt:conscrypt-android:2.0.0'
implementation 'org.signal:aesgcmprovider:0.0.3'
implementation 'org.webrtc:google-webrtc:1.0.32006'
//implementation 'org.whispersystems:webrtc-android:M74'
implementation 'io.github.webrtc-sdk:android:125.6422.04'
implementation "me.leolin:ShortcutBadger:1.1.16"
implementation 'se.emilsjolander:stickylistheaders:2.7.0'
implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
implementation 'commons-net:commons-net:3.7.2'
implementation 'com.github.chrisbanes:PhotoView:2.1.3'
implementation "com.github.bumptech.glide:glide:$glideVersion"
implementation 'com.google.firebase:firebase-crashlytics-buildtools:2.9.2'
implementation 'com.google.firebase:firebase-crashlytics-buildtools:3.0.2'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
kapt "com.github.bumptech.glide:compiler:$glideVersion"
implementation 'com.makeramen:roundedimageview:2.1.0'
implementation 'com.pnikosis:materialish-progress:1.5'
implementation 'org.greenrobot:eventbus:3.0.0'
implementation 'pl.tajchert:waitingdots:0.1.0'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
implementation 'com.vanniktech:android-image-cropper:4.5.0'
implementation 'com.melnykov:floatingactionbutton:1.3.0'
implementation 'com.google.zxing:android-integration:3.1.0'
implementation "com.google.dagger:hilt-android:$daggerVersion"
kapt "com.google.dagger:hilt-compiler:$daggerVersion"
implementation 'mobi.upod:time-duration-picker:1.1.3'
implementation 'com.google.zxing:core:3.2.1'
implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
exclude group: 'com.android.support', module: 'support-annotations'
}
implementation ('cn.carbswang.android:NumberPickerView:1.0.9') {
exclude group: 'com.android.support', module: 'appcompat-v7'
}
implementation ('com.tomergoldst.android:tooltips:1.0.6') {
exclude group: 'com.android.support', module: 'appcompat-v7'
}
Expand All @@ -66,13 +61,10 @@ dependencies {
exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
}
implementation 'com.annimon:stream:1.1.8'
implementation ('com.takisoft.fix:colorpicker:0.9.1') {
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'com.android.support', module: 'recyclerview-v7'
}
implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
implementation 'androidx.sqlite:sqlite-ktx:2.2.0'
implementation project(':stickyheader')
//implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
implementation 'com.github.dmytrodanylyk:android-morphing-button:1.0'
implementation 'androidx.sqlite:sqlite-ktx:2.3.1'
implementation 'net.zetetic:sqlcipher-android:4.5.4@aar'
implementation ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
exclude group: 'com.fasterxml.jackson.core'
Expand All @@ -92,21 +84,20 @@ dependencies {
implementation "nl.komponents.kovenant:kovenant:$kovenantVersion"
implementation "nl.komponents.kovenant:kovenant-android:$kovenantVersion"
implementation "com.github.lelloman:android-identicons:v11"
implementation "com.prof.rssparser:rssparser:2.0.4"
implementation "com.jakewharton.rxbinding3:rxbinding:3.1.0"
implementation "com.github.tbruyelle:rxpermissions:0.10.2"
implementation "com.github.ybq:Android-SpinKit:1.4.0"
implementation "com.opencsv:opencsv:4.6"
testImplementation 'junit:junit:#junitVersion'
testImplementation "junit:junit:$junitVersion"
testImplementation 'org.assertj:assertj-core:3.11.1'
testImplementation "org.mockito:mockito-inline:4.0.0"
testImplementation "org.mockito:mockito-inline:4.11.0"
testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
testImplementation "androidx.test:core:$testCoreVersion"
testImplementation "androidx.arch.core:core-testing:2.1.0"
testImplementation "androidx.arch.core:core-testing:2.2.0"
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
// Core library
Expand All @@ -116,36 +107,37 @@ dependencies {
}

// AndroidJUnitRunner and JUnit Rules
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test:rules:1.4.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test:rules:1.5.0'

// Assertions
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.ext:truth:1.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.ext:truth:1.5.0'
testImplementation 'com.google.truth:truth:1.1.3'
androidTestImplementation 'com.google.truth:truth:1.1.3'

// Espresso dependencies
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-web:3.4.0'
androidTestImplementation 'androidx.test.espresso.idling:idling-concurrent:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.4.0'
androidTestUtil 'androidx.test:orchestrator:1.4.1'

testImplementation 'org.robolectric:robolectric:4.4'
testImplementation 'org.robolectric:shadows-multidex:4.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-web:3.5.1'
androidTestImplementation 'androidx.test.espresso.idling:idling-concurrent:3.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.5.1'
androidTestUtil 'androidx.test:orchestrator:1.4.2'
testImplementation 'org.robolectric:robolectric:4.13'
testImplementation 'org.robolectric:shadows-multidex:4.13'

//Lottie Animation
implementation 'com.airbnb.android:lottie:3.4.0'

//New Line//
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
kapt 'org.projectlombok:lombok:1.18.22'
implementation 'com.jakewharton.timber:timber:5.0.1'
implementation "io.github.rburgst:okhttp-digest:2.5"
implementation 'com.google.android.play:core:1.8.3'
implementation 'com.google.android.play:app-update:2.1.0'
implementation 'com.google.android.play:app-update-ktx:2.1.0'

implementation 'dnsjava:dnsjava:3.4.2'
implementation 'org.jitsi:dnssecjava:2.0.0'
Expand All @@ -171,7 +163,7 @@ dependencies {
implementation("io.coil-kt:coil-compose:2.3.0")

//firebase new dependency
implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
implementation(platform("com.google.firebase:firebase-bom:33.2.0"))
implementation("com.google.firebase:firebase-config")
implementation("com.google.firebase:firebase-analytics")

Expand Down
6 changes: 3 additions & 3 deletions app/lint-baseline.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
id="LintError"
message="Unexpected failure during lint analysis of JobManager.java (this is a bug in lint or one of the libraries it depends on)

Stack: `NullPointerException:ClsFileImpl.getMirror(ClsFileImpl.java:343)←ClsElementImpl.getMirror(ClsElementImpl.java:159)←ClsElementImpl.getText(ClsElementImpl.java:202)←InferenceBchat.argConstraints(InferenceBchat.java:1817)←InferenceBchat.isFunctionalTypeMoreSpecific(InferenceBchat.java:1748)←InferenceBchat.isFunctionalTypeMoreSpecificOnExpression(InferenceBchat.java:1729)←JavaMethodsConflictResolver.isFunctionalTypeMoreSpecific(JavaMethodsConflictResolver.java:779)←JavaMethodsConflictResolver.isTypeMoreSpecific(JavaMethodsConflictResolver.java:673)`

You can set environment variable `LINT_PRINT_STACKTRACE=true` to dump a full stacktrace to stdout.">
<location
file="src/main/java/com.thoughtcrimes.securesms/jobmanager/JobManager.java"/>
file="src/main/java/io.beldex.bchat/jobmanager/JobManager.java"/>
</issue>

<issue
Expand All @@ -14,7 +14,7 @@
errorLine1=" List&lt;SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/com.thoughtcrimes.securesms/util/dualsim/SubscriptionManagerCompat.java"
file="src/main/java/io.beldex.bchat/util/dualsim/SubscriptionManagerCompat.java"
line="101"
column="35"/>
</issue>
Expand All @@ -25,7 +25,7 @@
errorLine1=" drawables.getColor(1, 0xff000000);"
errorLine2=" ~">
<location
file="src/main/java/com.thoughtcrimes.securesms/contacts/ContactSelectionListAdapter.java"
file="src/main/java/io.beldex.bchat/contacts/ContactSelectionListAdapter.java"
line="187"
column="36"/>
</issue>
Expand Down
24 changes: 12 additions & 12 deletions app/playMainNet/release/output-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"type": "UNIVERSAL",
"filters": [],
"attributes": [],
"versionCode": 46,
"versionName": "2.5.1",
"outputFile": "Bchat-2.5.1-universal.apk"
"versionCode": 67,
"versionName": "2.5.3",
"outputFile": "Bchat-2.5.3-universal.apk"
},
{
"type": "ONE_OF_MANY",
Expand All @@ -24,9 +24,9 @@
}
],
"attributes": [],
"versionCode": 46,
"versionName": "2.5.1",
"outputFile": "Bchat-2.5.1-armeabi-v7a.apk"
"versionCode": 67,
"versionName": "2.5.3",
"outputFile": "Bchat-2.5.3-armeabi-v7a.apk"
},
{
"type": "ONE_OF_MANY",
Expand All @@ -37,9 +37,9 @@
}
],
"attributes": [],
"versionCode": 46,
"versionName": "2.5.1",
"outputFile": "Bchat-2.5.1-x86_64.apk"
"versionCode": 67,
"versionName": "2.5.3",
"outputFile": "Bchat-2.5.3-x86_64.apk"
},
{
"type": "ONE_OF_MANY",
Expand All @@ -50,9 +50,9 @@
}
],
"attributes": [],
"versionCode": 46,
"versionName": "2.5.1",
"outputFile": "Bchat-2.5.1-arm64-v8a.apk"
"versionCode": 67,
"versionName": "2.5.3",
"outputFile": "Bchat-2.5.3-arm64-v8a.apk"
}
],
"elementType": "File"
Expand Down
Loading

0 comments on commit 656615a

Please sign in to comment.