AND-3873: Fix android build (#21)

* Fix android build Signed-off-by: Doston Kamalov <[email protected]> * Deleted unnecessary github workflow Signed-off-by: Doston Kamalov <[email protected]> --------- Signed-off-by: Doston Kamalov <[email protected]>
tangem · Jul 27, 2023 · 7983be4 · 7983be4
1 parent 5a6d8c6
commit 7983be4
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 110 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/trustwalletcore/maven-push.gradle b/android/trustwalletcore/maven-push.gradle
diff --git a/android/wallet-core/build.gradle b/android/wallet-core/build.gradle
@@ -4,10 +4,11 @@ apply plugin: 'maven-publish'
 group = 'com.trustwallet'
 
 android {
-    compileSdkVersion 31
+    namespace 'wallet.core'
+    compileSdkVersion 32
     ndkVersion '23.1.7779620'
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 23
         versionCode 1
         versionName "1.0"
         externalNativeBuild {

diff --git a/jni/cpp/AnySigner.cpp → jni/android/AnySigner.cpp b/jni/cpp/AnySigner.cpp → jni/android/AnySigner.cpp
diff --git a/tools/android-build b/tools/android-build
@@ -8,8 +8,8 @@ source $(dirname $0)/library
 version=$(wc_read_version)
 
 pushd android
-./gradlew assembleRelease --info
-cp trustwalletcore/build/outputs/aar/trustwalletcore-release.aar ../build/trustwalletcore.aar
+./gradlew assembleRelease
+cp wallet-core/build/outputs/aar/wallet-core-release.aar ../build/wallet-core.aar
 popd
 
 echo "Now upload build/wallet-core.aar to https://github.com/TrustWallet/trust-wallet-core/releases/tag/$version"

diff --git a/tools/tangem-android-build.sh b/tools/tangem-android-build.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# Initializes the workspace with dependencies, then performs full build
+
+# Fail if any commands fails
+set -e
+
+echo "#### Initializing workspace with dependencies ... ####"
+echo "Install system deps"
+tools/install-sys-dependencies-mac
+tools/install-rust-dependencies
+
+echo "Install android deps"
+tools/install-android-dependencies
+tools/install-dependencies
+
+echo "#### Generating android files ... ####"
+tools/generate-files android
+
+echo "#### Building android ... ####"
+tools/android-build