Skip to content

Commit

Permalink
update target sdk to 33, update dependencies (#10)
Browse files Browse the repository at this point in the history
* update target sdk to 33, update dependencies

* add signed release
  • Loading branch information
fardog authored Dec 15, 2022
1 parent 5c70139 commit cf19568
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 23 deletions.
21 changes: 10 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,32 @@ 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 {
minifyEnabled false
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'
}
Binary file modified app/release/app-release.apk
Binary file not shown.
1 change: 0 additions & 1 deletion app/release/output.json

This file was deleted.

15 changes: 9 additions & 6 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="io.fardog.timestamp">
xmlns:tools="http://schemas.android.com/tools">

<uses-feature android:name="android.hardware.type.watch" />

Expand All @@ -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">
<intent-filter>
<action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
</intent-filter>
Expand All @@ -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">
<intent-filter>
<action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
</intent-filter>
Expand All @@ -58,15 +59,17 @@

<activity
android:name=".AboutActivity"
android:label="@string/title_activity_about">
android:label="@string/title_activity_about"
android:exported="false">
<intent-filter>
<action android:name="io.fardog.timestamp.AboutActivity" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".SettingsActivity"
android:label="@string/title_activity_settings">
android:label="@string/title_activity_settings"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/io/fardog/timestamp/SettingsActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -18,7 +18,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit cf19568

Please sign in to comment.