Skip to content

Commit

Permalink
Rollback version
Browse files Browse the repository at this point in the history
  • Loading branch information
y3fers0n committed Jul 11, 2024
1 parent 4bcf8ce commit 5954f82
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 13 deletions.
3 changes: 1 addition & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ plugins {
}

android {
namespace 'com.trust.web3.demo'
compileSdkVersion 30
buildToolsVersion "30.0.3"

Expand Down Expand Up @@ -43,7 +42,7 @@ dependencies {
implementation "com.louiscad.splitties:splitties-alertdialog-material:3.0.0"
implementation "com.trustwallet:wallet-core:2.9.7"

implementation 'com.github.trustwallet:trust-web3-provider:4.0.1:packages/android-web3-provider/lib'
implementation 'com.github.trustwallet:trust-web3-provider:2.0.0-alpha'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
Expand Down
4 changes: 3 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.trust.web3.demo">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import android.webkit.SslErrorHandler
import android.webkit.WebView
import android.webkit.WebViewClient
import androidx.appcompat.app.AppCompatActivity
import com.example.namespace.R

class MainActivity : AppCompatActivity() {
companion object {
Expand Down
13 changes: 8 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@


// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = "1.8.0"
ext.kotlin_version = "1.4.31"
repositories {
google()
mavenCentral()

maven { url 'https://jitpack.io' }
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.2'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
}
}

allprojects {
repositories {
google()
mavenCentral()

maven { url 'https://jitpack.io' }

maven {
url = uri("https://maven.pkg.github.com/trustwallet/wallet-core")
Properties properties = new Properties()
Expand All @@ -32,4 +35,4 @@ allprojects {

task clean(type: Delete) {
delete rootProject.buildDir
}
}
4 changes: 2 additions & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Jul 11 13:20:47 ART 2024
#Wed Mar 17 17:43:08 JST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3 changes: 2 additions & 1 deletion android/lib/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'maven-publish'

group='com.trustwallet'
Expand All @@ -12,7 +13,7 @@ def getVersionName = { ->

android {
compileSdkVersion 28
namespace 'trust.web3jproviderV2'

defaultConfig {
minSdkVersion 23
targetSdkVersion 28
Expand Down
2 changes: 1 addition & 1 deletion android/lib/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<manifest />
<manifest package="trust.web3jprovider" />

0 comments on commit 5954f82

Please sign in to comment.