Skip to content

Commit 0b5f45c

Browse files
committed
new libraries versions
1 parent 0237fc3 commit 0b5f45c

15 files changed

Lines changed: 54 additions & 44 deletions

File tree

auto-content-provider/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ ext.sync_framework_artifact_id = 'auto-content-provider'
55
apply from: '../publish.gradle'
66

77
android {
8-
namespace 'pl.selvin.android.autocontentprovider'
9-
compileSdk 34
8+
namespace = 'pl.selvin.android.autocontentprovider'
9+
compileSdk = 35
1010

1111
defaultConfig {
1212
minSdkVersion 22
13-
targetSdkVersion 34
13+
targetSdkVersion 35
1414
consumerProguardFiles 'proguard-rules.pro'
1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
}

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
plugins {
2+
alias libs.plugins.android.gradle.plugin apply false
3+
alias libs.plugins.android.gradle.library.plugin apply false
4+
}

demo/build.gradle

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,48 +7,48 @@ apply from: '../version.gradle'
77
def disabledColor = 0xADADAD
88

99
android {
10-
namespace 'pl.selvin.android.listsyncsample'
11-
compileSdk 34
10+
namespace = 'pl.selvin.android.listsyncsample'
11+
compileSdk = 35
1212

1313
flavorDimensions = ["db_impl"]
1414

1515
defaultConfig {
1616
applicationId 'pl.selvin.android.listsyncsample'
1717
minSdkVersion 22
18-
targetSdkVersion 34
18+
targetSdkVersion 35
1919
versionCode sync_framework_version_int
2020
versionName sync_framework_version
2121
}
2222

2323
signingConfigs {
2424
release {
25-
keyAlias 'androiddebugkey'
26-
keyPassword 'android'
27-
storeFile file('debug.keystore')
28-
storePassword 'android'
25+
keyAlias = 'androiddebugkey'
26+
keyPassword = 'android'
27+
storeFile = file('debug.keystore')
28+
storePassword = 'android'
2929
}
3030
}
3131

3232
buildTypes {
3333
release {
34-
shrinkResources true
35-
minifyEnabled true
34+
shrinkResources = true
35+
minifyEnabled = true
3636
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
37-
signingConfig signingConfigs.release
37+
signingConfig = signingConfigs.release
3838
}
3939

4040
debug {
41-
versionNameSuffix "(deb)"
41+
versionNameSuffix = "(deb)"
4242
}
4343
}
4444

4545
compileOptions {
46-
sourceCompatibility JavaVersion.VERSION_1_8
47-
targetCompatibility JavaVersion.VERSION_1_8
46+
sourceCompatibility = JavaVersion.VERSION_1_8
47+
targetCompatibility = JavaVersion.VERSION_1_8
4848
}
4949
buildFeatures {
50-
aidl true
51-
buildConfig true
50+
aidl = true
51+
buildConfig = true
5252
}
5353

5454
android.applicationVariants.configureEach { variant ->

demo/proguard-rules.pro

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
-dontwarn okio.**
44
-dontnote okhttp3.**
55
-dontnote android.net.**
6-
-dontnote org.apache.**
76
-dontnote pl.selvin.android.syncframework.content.**
87
-keep class net.sqlcipher.** { *; }
98
-keep public class net.sqlcipher.database.** { *; }

demo/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:label="@string/app_name"
1919
android:networkSecurityConfig="@xml/network_security_config"
2020
android:supportsRtl="true"
21-
android:theme="@style/AppBaseTheme"
21+
android:theme="@style/AppTheme"
2222
tools:ignore="GoogleAppIndexingWarning"
2323
tools:targetApi="n">
2424

demo/src/main/java/pl/selvin/android/listsyncsample/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public interface Constants {
1515
String ACCOUNT_TYPE = BuildConfig.APPLICATION_ID;
1616
String AUTHORITY = BuildConfig.APPLICATION_ID;
1717
String AUTH_TOKEN_TYPE = BuildConfig.APPLICATION_ID;
18-
String SERVICE_URI = "http://selvin.pl/listservice/";
18+
String SERVICE_URI = "https://selvin.pl/listservice/";
1919
long SEARCH_VIEW_DELAY = 600;
2020

2121
class StringUtil {

demo/src/main/java/pl/selvin/android/listsyncsample/ui/ListsListFragment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ protected ListAdapter createListAdapter() {
7979
@Override
8080
public void onCreate(Bundle savedInstanceState) {
8181
super.onCreate(savedInstanceState);
82-
setHasOptionsMenu(true);
8382
SearchComponent.install(this, R.string.lists_search_hint);
8483
}
8584

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="AppTheme" parent="AppBaseTheme">
4+
<item name="list_item_background">?android:attr/selectableItemBackground</item>
5+
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
6+
</style>
7+
</resources>

demo/themes.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,13 @@ class ThemesExtension {
9191
def flavourName = flavour.name.capitalize()
9292
path = project.layout.buildDirectory.dir("generated/res/themed/${flavourName}").get()
9393
def generateColorsTask = project.tasks.register("generate${flavourName}Themes", GenerateColors) {
94-
outputFile project.file("${this.path}/values/colors.xml")
95-
colorsMap this.colorsMap
94+
outputFile = project.file("${this.path}/values/colors.xml")
95+
colorsMap = this.colorsMap
9696
}
9797
if (project.file("themed/drawable").exists()) {
9898
generateTask = project.tasks.register("generate${flavourName}ThemedVectorDrawables", GenerateThemedVectorDrawable) {
9999
inputDir = project.file("themed/drawable")
100100
outputDir = project.file("${this.path}/drawable")
101-
colorsMapVector this.colorsMapVector
102101
dependsOn(generateColorsTask)
103102
}
104103
}
@@ -108,7 +107,7 @@ class ThemesExtension {
108107
outputDirs = sizes.collectEntries {
109108
[(it): project.file("${this.path}/mipmap-${it.getResourceValue()}")]
110109
}
111-
colorsMapVector this.colorsMapVector
110+
colorsMapVector = this.colorsMapVector
112111
dependsOn(generateColorsTask)
113112
}
114113
}

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ org.gradle.vfs.watch=true
44
android.useAndroidX=true
55
android.nonTransitiveRClass=true
66
android.nonFinalResIds=true
7-
org.gradle.configuration-cache=true
7+
org.gradle.configuration-cache=true
8+
org.gradle.warning.mode=all

0 commit comments

Comments
 (0)