Skip to content

Commit 6e476ea

Browse files
author
Bob
committed
Aligned to changed BE, upgraded tool and dependency versions
1 parent 643157b commit 6e476ea

File tree

7 files changed

+189
-135
lines changed

7 files changed

+189
-135
lines changed

app/build.gradle

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

33
android {
4-
compileSdkVersion 31
54
defaultConfig {
65
applicationId "ru.coolsoft.iris2go"
76
minSdkVersion 19
8-
targetSdkVersion 31
7+
targetSdkVersion 33
98
versionCode 1
109
versionName "1.0"
1110
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -16,15 +15,16 @@ android {
1615
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1716
}
1817
}
18+
namespace 'ru.coolsoft.iris2go'
1919
}
2020

2121
dependencies {
2222
implementation fileTree(dir: 'libs', include: ['*.jar'])
23-
implementation 'androidx.appcompat:appcompat:1.4.2'
23+
implementation 'androidx.appcompat:appcompat:1.6.1'
2424
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
2525
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
2626
implementation 'com.squareup.retrofit2:converter-simplexml:2.3.0'
27-
testImplementation 'junit:junit:4.12'
28-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
29-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
27+
testImplementation 'junit:junit:4.13.2'
28+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
29+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
3030
}

app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
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"
4-
package="ru.coolsoft.iris2go">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.INTERNET" />
76

87
<application
98
android:allowBackup="false"
9+
android:fullBackupContent="false"
10+
android:dataExtractionRules="@xml/data_extraction_rules"
1011
android:icon="@drawable/logo"
1112
android:label="@string/app_name"
1213
android:supportsRtl="true"
1314
android:theme="@style/AppTheme"
14-
tools:ignore="GoogleAppIndexingWarning">
15+
tools:ignore="GoogleAppIndexingWarning"
16+
tools:targetApi="s">
1517

1618
<activity
1719
android:name=".MainActivity"
1820
android:icon="@drawable/logo"
19-
android:exported="false">
21+
android:exported="true">
2022
<intent-filter>
2123
<action android:name="android.intent.action.MAIN" />
2224

app/src/main/java/ru/coolsoft/iris2go/rest/Config.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ru.coolsoft.iris2go.rest;
22

33
class Config {
4-
static final String SERVER = "https://slovar.co.il/";
4+
static final String SERVER = "https://www.slovar.co.il/";
55
static final String ENDPOINT_TRANSLATE = "txajax.php";
66

77
static final String ARG_XAJAX = "xajax";
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<data-extraction-rules>
4+
<cloud-backup>
5+
<exclude domain="root" />
6+
<exclude domain="file" />
7+
<exclude domain="database" />
8+
<exclude domain="sharedpref" />
9+
<exclude domain="external" />
10+
</cloud-backup>
11+
<device-transfer>
12+
<exclude domain="root" />
13+
<exclude domain="file" />
14+
<exclude domain="database" />
15+
<exclude domain="sharedpref" />
16+
<exclude domain="external" />
17+
</device-transfer>
18+
</data-extraction-rules>

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.2.2'
10+
classpath 'com.android.tools.build:gradle:7.4.2'
1111

1212

1313
// NOTE: Do not place your application dependencies here; they belong
@@ -22,6 +22,6 @@ allprojects {
2222
}
2323
}
2424

25-
task clean(type: Delete) {
25+
tasks.register('clean', Delete) {
2626
delete rootProject.buildDir
2727
}

0 commit comments

Comments
 (0)