Skip to content

Commit c8993a8

Browse files
SimoneTinellaSimoneTinella
committed
updated libs. migration to AndroidX
1 parent 19d42ec commit c8993a8

40 files changed

Lines changed: 170 additions & 76 deletions

‎.idea/codeStyles/Project.xml‎

Lines changed: 109 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
4+
compileSdkVersion 29
55
defaultConfig {
66
applicationId "org.twistedappdeveloper.opcclient"
77
minSdkVersion 17
8-
targetSdkVersion 28
8+
targetSdkVersion 29
99
versionCode 14
1010
versionName "1.0.8.1"
1111
multiDexEnabled true
@@ -31,26 +31,26 @@ android {
3131
dependencies {
3232
implementation fileTree(include: ['*.jar'], dir: 'libs')
3333

34-
implementation 'org.slf4j:slf4j-android:1.7.25'
34+
implementation 'org.slf4j:slf4j-android:1.7.30'
3535

3636
implementation group: 'com.madgag.spongycastle', name: 'prov', version: '1.58.0.0'
3737
implementation group: 'com.madgag.spongycastle', name: 'core', version: '1.58.0.0'
3838
implementation group: 'com.madgag.spongycastle', name: 'bcpkix-jdk15on', version: '1.58.0.0'
3939

40-
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60'
41-
implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.60'
40+
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.64'
41+
implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.64'
4242

43-
implementation group: 'org.apache.httpcomponents', name: 'httpcore-nio', version: '4.4.10'
44-
implementation group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.10'
43+
implementation group: 'org.apache.httpcomponents', name: 'httpcore-nio', version: '4.4.13'
44+
implementation group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.13'
4545

46-
implementation group: 'commons-codec', name: 'commons-codec', version: '1.10'
46+
implementation group: 'commons-codec', name: 'commons-codec', version: '20041127.091804'
4747
implementation files('libs/commons-logging-1.2.jar')
4848

4949
implementation files('libs/httpclient-4.5.6.jar')
5050
implementation files('libs/opc-ua-stack-1.4.1.1-SNAPSHOT.jar')
5151
implementation files('libs/opc-ua-stack-1.4.1.1-SNAPSHOT-sources.jar')
5252

53-
implementation 'com.android.support:appcompat-v7:28.0.0'
54-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
53+
implementation 'androidx.appcompat:appcompat:1.1.0'
54+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
5555
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.17'
5656
}

‎app/libs/opc-ua-stack-1.4.1.1-SNAPSHOT-sources.jar‎

944 Bytes
Binary file not shown.

‎app/libs/opc-ua-stack-1.4.1.1-SNAPSHOT.jar‎

1.04 KB
Binary file not shown.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="org.twistedappdeveloper.opcclient">
45

56
<uses-permission android:name="android.permission.INTERNET" />
6-
<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
7-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
87

98
<application
10-
android:allowBackup="true"
9+
android:allowBackup="false"
1110
android:icon="@mipmap/ic_launcher"
1211
android:roundIcon="@mipmap/ic_launcher_round"
1312
android:label="@string/app_name"
1413
android:supportsRtl="true"
15-
android:theme="@style/AppTheme">
14+
android:theme="@style/AppTheme"
15+
tools:ignore="LockedOrientationActivity">
1616
<activity
1717
android:name=".MainActivity"
18-
android:screenOrientation="portrait">
18+
android:screenOrientation="userPortrait">
1919
<intent-filter>
2020
<action android:name="android.intent.action.MAIN" />
2121

@@ -24,24 +24,24 @@
2424
</activity>
2525
<activity
2626
android:name=".SessionActivity"
27-
android:screenOrientation="portrait" />
27+
android:screenOrientation="userPortrait" />
2828
<activity
2929
android:name=".SelectSessionActivity"
30-
android:screenOrientation="portrait" />
30+
android:screenOrientation="userPortrait" />
3131
<activity
3232
android:name=".ListSubscriptionActivity"
33-
android:screenOrientation="portrait" />
33+
android:screenOrientation="userPortrait" />
3434
<activity
3535
android:name=".SubscriptionActivity"
36-
android:screenOrientation="portrait" />
36+
android:screenOrientation="userPortrait" />
3737
<activity
3838
android:name=".MonitoredItemActivity"
39-
android:screenOrientation="portrait" />
39+
android:screenOrientation="userPortrait" />
4040
<activity
4141
android:name=".BrowseActivity"
42-
android:screenOrientation="portrait" />
42+
android:screenOrientation="userPortrait" />
4343
<activity android:name=".ReadActivity" />
44-
<activity android:name=".MonitoringActivity"></activity>
44+
<activity android:name=".MonitoringActivity" />
4545
</application>
4646

4747
</manifest>

‎app/src/main/java/OpcUtils/BackListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package OpcUtils;
22

33

4-
import android.support.v4.app.FragmentManager;
4+
import androidx.fragment.app.FragmentManager;
55

66
public class BackListener implements FragmentManager.OnBackStackChangedListener {
77

‎app/src/main/java/org/twistedappdeveloper/opcclient/BrowseActivity.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,20 @@
66
import android.os.Bundle;
77
import android.os.Handler;
88
import android.os.Message;
9-
import android.support.v4.app.FragmentManager;
10-
import android.support.v4.app.FragmentTransaction;
11-
import android.support.v7.app.AlertDialog;
12-
import android.support.v7.app.AppCompatActivity;
9+
import androidx.fragment.app.FragmentManager;
10+
import androidx.fragment.app.FragmentTransaction;
11+
import androidx.appcompat.app.AlertDialog;
12+
import androidx.appcompat.app.AppCompatActivity;
1313
import android.view.Menu;
1414
import android.view.MenuInflater;
1515
import android.view.MenuItem;
16-
import android.widget.ImageView;
1716
import android.widget.Toast;
1817

1918
import org.opcfoundation.ua.builtintypes.StatusCode;
2019
import org.opcfoundation.ua.core.BrowseResponse;
2120
import org.opcfoundation.ua.core.Identifiers;
2221
import org.opcfoundation.ua.core.ReferenceDescription;
2322

24-
import java.io.IOException;
25-
import java.io.InputStream;
2623
import java.util.ArrayList;
2724

2825
import OpcUtils.BackListener;

‎app/src/main/java/org/twistedappdeveloper/opcclient/BrowseFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import android.os.Bundle;
88
import android.os.Handler;
99
import android.os.Message;
10-
import android.support.annotation.NonNull;
11-
import android.support.annotation.Nullable;
12-
import android.support.v4.app.Fragment;
13-
import android.support.v7.app.AlertDialog;
10+
import androidx.annotation.NonNull;
11+
import androidx.annotation.Nullable;
12+
import androidx.fragment.app.Fragment;
13+
import androidx.appcompat.app.AlertDialog;
1414
import android.text.TextUtils;
1515
import android.view.LayoutInflater;
1616
import android.view.View;

0 commit comments

Comments
 (0)