Skip to content

Commit e8b5ee2

Browse files
committed
Android: replace jcenter() with mavenCentral(), migrate to AndroidX (F-1804)
1 parent 9f85f39 commit e8b5ee2

5 files changed

Lines changed: 11 additions & 10 deletions

File tree

IDE/Android/app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
targetSdkVersion 33
1212
versionCode 1
1313
versionName "1.0"
14-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
testInstrumentationRunnerArguments notClass: 'com.wolfssl.wolfcrypt.test.WolfCryptTestSuite,com.wolfssl.provider.jce.test.WolfJCETestSuite,com.wolfssl.wolfcrypt.test.fips.WolfCryptFipsTestSuite'
1616
externalNativeBuild {
1717
cmake {
@@ -42,10 +42,10 @@ android {
4242

4343
dependencies {
4444
implementation fileTree(dir: 'libs', include: ['*.jar'])
45-
implementation 'com.android.support:appcompat-v7:28.0.0'
46-
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
45+
implementation 'androidx.appcompat:appcompat:1.6.1'
46+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
4747
testImplementation 'junit:junit:4.13.2'
4848
androidTestImplementation 'junit:junit:4.13.2'
49-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
50-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
49+
androidTestImplementation 'androidx.test:runner:1.5.2'
50+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
5151
}

IDE/Android/app/src/main/java/com/example/wolfssl/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
package com.example.wolfssl;
2424

25-
import android.support.v7.app.AppCompatActivity;
25+
import androidx.appcompat.app.AppCompatActivity;
2626
import android.os.Bundle;
2727
import android.view.View;
2828
import android.widget.Button;

IDE/Android/app/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -31,4 +31,4 @@
3131
app:layout_constraintTop_toTopOf="parent"
3232
app:layout_constraintVertical_bias="0.067" />
3333

34-
</android.support.constraint.ConstraintLayout>
34+
</androidx.constraintlayout.widget.ConstraintLayout>

IDE/Android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
buildscript {
44
repositories {
55
google()
6-
jcenter()
6+
mavenCentral()
77

88
}
99
dependencies {
@@ -17,7 +17,7 @@ buildscript {
1717
allprojects {
1818
repositories {
1919
google()
20-
jcenter()
20+
mavenCentral()
2121
}
2222
gradle.projectsEvaluated {
2323
tasks.withType(JavaCompile) {

IDE/Android/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +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+
android.useAndroidX=true
910
android.nonFinalResIds=false
1011
android.nonTransitiveRClass=false
1112
org.gradle.jvmargs=-Xmx1536m

0 commit comments

Comments
 (0)