diff --git a/app/build.gradle b/app/build.gradle index f896c3e..dfd5b41 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,16 +2,14 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - android { - compileSdkVersion 29 + compileSdkVersion 33 defaultConfig { applicationId "io.fardog.timestamp" minSdkVersion 25 - targetSdkVersion 29 - versionCode 6 - versionName "1.3.0" + targetSdkVersion 33 + versionCode 7 + versionName "1.4.0" } buildTypes { release { @@ -19,16 +17,17 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + namespace 'io.fardog.timestamp' } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.google.android.support:wearable:2.5.0' - implementation 'com.google.android.gms:play-services-wearable:17.0.0' + implementation 'com.google.android.support:wearable:2.9.0' + implementation 'com.google.android.gms:play-services-wearable:18.0.0' implementation 'androidx.percentlayout:percentlayout:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'androidx.wear:wear:1.0.0' - compileOnly 'com.google.android.wearable:wearable:2.5.0' + implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.wear:wear:1.2.0' + compileOnly 'com.google.android.wearable:wearable:2.9.0' } diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 28616e0..1f4c4c5 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json deleted file mode 100644 index 672b122..0000000 --- a/app/release/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"1.3.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1dd809e..d6bb6f3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> @@ -26,7 +25,8 @@ android:name=".UTCProviderClass" android:icon="@drawable/ic_utc" android:label="@string/utc_provider" - android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER"> + android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER" + android:exported="true"> @@ -39,7 +39,8 @@ android:name=".TimestampProviderClass" android:icon="@drawable/ic_ts" android:label="@string/ts_provider" - android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER"> + android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER" + android:exported="true"> @@ -58,7 +59,8 @@ + android:label="@string/title_activity_about" + android:exported="false"> @@ -66,7 +68,8 @@ + android:label="@string/title_activity_settings" + android:exported="true"> diff --git a/app/src/main/java/io/fardog/timestamp/SettingsActivity.kt b/app/src/main/java/io/fardog/timestamp/SettingsActivity.kt index 2b1fd0f..6343b0d 100644 --- a/app/src/main/java/io/fardog/timestamp/SettingsActivity.kt +++ b/app/src/main/java/io/fardog/timestamp/SettingsActivity.kt @@ -48,6 +48,7 @@ class SettingsActivity : WearableActivity(), SharedPreferences.OnSharedPreferenc } class UTCPreferenceFragment : PreferenceFragment() { + @Deprecated("Deprecated") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) addPreferencesFromResource(R.xml.utc_settings) diff --git a/build.gradle b/build.gradle index a75be3a..a373996 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.7.20' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:7.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -18,7 +18,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 74d1ca4..de4c3c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip