diff --git a/README.md b/README.md index 10c28111..5b48f5f3 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Simple Bitcoin Wallet (aka SBW) is a non-custodial Bitcoin wallet for Android. ``` git clone https://github.com/btcontract/wallet.git cd wallet -git checkout 2.5.5 +git checkout 2.5.6 podman build -t sbw . podman run -v $PWD:/app/simplebitcoinwallet/wallet:z sbw ``` @@ -32,15 +32,15 @@ podman run -v $PWD:/app/simplebitcoinwallet/wallet:z sbw Install Android SDK, create a `keystore.jks` using `keytool`. ``` -$ /build-tools//zipalign -v 4 app/build/outputs/apk/release/SBW-2.5.5.apk app/build/outputs/apk/release/SBW-2.5.5-aligned.apk +$ /build-tools//zipalign -v 4 app/build/outputs/apk/release/SBW-2.5.6.apk app/build/outputs/apk/release/SBW-2.5.6-aligned.apk -$ /build-tools//apksigner sign --ks --ks-key-alias --v1-signing-enabled true --v2-signing-enabled true app/build/outputs/apk/release/SBW-2.5.5-aligned.apk +$ /build-tools//apksigner sign --ks --ks-key-alias --v1-signing-enabled true --v2-signing-enabled true app/build/outputs/apk/release/SBW-2.5.6-aligned.apk ``` ## Verification with `apksigner` ``` -$ '/build-tools//apksigner' verify --print-certs --verbose SBW-2.5.5.apk +$ '/build-tools//apksigner' verify --print-certs --verbose SBW-2.5.6.apk ``` Output should contain the following info: diff --git a/app/build.gradle b/app/build.gradle index 60c9b0bc..1d1d9343 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,17 +6,17 @@ task wrapper(type: Wrapper) { } android { - compileSdkVersion 30 + compileSdkVersion 33 buildToolsVersion '34.0.0' defaultConfig { testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' applicationId 'com.btcontract.wallet' - targetSdkVersion 30 + targetSdkVersion 33 minSdkVersion 21 - versionName '2.5.5' - versionCode 106 + versionName '2.5.6' + versionCode 107 } buildTypes { diff --git a/app/src/main/java/com/btcontract/wallet/HubActivity.scala b/app/src/main/java/com/btcontract/wallet/HubActivity.scala index de218da7..e95b4443 100644 --- a/app/src/main/java/com/btcontract/wallet/HubActivity.scala +++ b/app/src/main/java/com/btcontract/wallet/HubActivity.scala @@ -12,7 +12,7 @@ import androidx.appcompat.app.AlertDialog import androidx.recyclerview.widget.RecyclerView import com.btcontract.wallet.BaseActivity.StringOps import com.btcontract.wallet.Colors._ -import com.btcontract.wallet.HubActivity.{addressSpec, _} +import com.btcontract.wallet.HubActivity._ import com.btcontract.wallet.R.string._ import com.btcontract.wallet.utils._ import com.chauthai.swipereveallayout.{SwipeRevealLayout, ViewBinderHelper} diff --git a/app/src/main/java/com/btcontract/wallet/WalletApp.scala b/app/src/main/java/com/btcontract/wallet/WalletApp.scala index 4ffea299..c30707f7 100644 --- a/app/src/main/java/com/btcontract/wallet/WalletApp.scala +++ b/app/src/main/java/com/btcontract/wallet/WalletApp.scala @@ -86,7 +86,7 @@ object WalletApp { } def makeAlive: Unit = { - ElectrumWallet.chainHash = Block.TestnetGenesisBlock.hash + ElectrumWallet.chainHash = Block.LivenetGenesisBlock.hash val miscInterface = new DBInterfaceSQLiteAndroidMisc(app, "misc.db") miscInterface txWrap { diff --git a/fastlane/metadata/android/en-US/changelogs/107.txt b/fastlane/metadata/android/en-US/changelogs/107.txt new file mode 100644 index 00000000..31fc3177 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/107.txt @@ -0,0 +1 @@ +* Minor bugfixes and improvements. \ No newline at end of file