Update dependencies
This commit is contained in:
parent
642d24b837
commit
370efe184b
|
@ -15,6 +15,7 @@ jacoco.toolVersion = "0.8.7"
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
|
namespace 'org.pixeldroid.app'
|
||||||
compileSdkVersion 32
|
compileSdkVersion 32
|
||||||
buildToolsVersion '31.0.0'
|
buildToolsVersion '31.0.0'
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
@ -27,7 +28,6 @@ android {
|
||||||
freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn"]
|
freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn"]
|
||||||
}
|
}
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "org.pixeldroid.app"
|
|
||||||
minSdkVersion 23
|
minSdkVersion 23
|
||||||
targetSdkVersion 32
|
targetSdkVersion 32
|
||||||
versionCode 17
|
versionCode 17
|
||||||
|
|
|
@ -515,11 +515,6 @@
|
||||||
license: The Apache Software License, Version 2.0
|
license: The Apache Software License, Version 2.0
|
||||||
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
|
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||||
url: http://tools.android.com
|
url: http://tools.android.com
|
||||||
- artifact: androidx.databinding:databinding-ktx:+
|
|
||||||
name: databinding-ktx
|
|
||||||
copyrightHolder: Google Inc.
|
|
||||||
license: The Apache Software License, Version 2.0
|
|
||||||
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
|
|
||||||
- artifact: androidx.lifecycle:lifecycle-process:+
|
- artifact: androidx.lifecycle:lifecycle-process:+
|
||||||
name: lifecycle-process
|
name: lifecycle-process
|
||||||
copyrightHolder: Google Inc.
|
copyrightHolder: Google Inc.
|
||||||
|
@ -670,11 +665,6 @@
|
||||||
license: The Apache Software License, Version 2.0
|
license: The Apache Software License, Version 2.0
|
||||||
licenseUrl: https://www.apache.org/licenses/LICENSE-2.0.txt
|
licenseUrl: https://www.apache.org/licenses/LICENSE-2.0.txt
|
||||||
url: https://github.com/Kotlin/kotlinx.coroutines
|
url: https://github.com/Kotlin/kotlinx.coroutines
|
||||||
- artifact: androidx.databinding:viewbinding:+
|
|
||||||
name: viewbinding
|
|
||||||
copyrightHolder: Google Inc.
|
|
||||||
license: The Apache Software License, Version 2.0
|
|
||||||
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
|
|
||||||
- artifact: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:+
|
- artifact: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:+
|
||||||
name: kotlinx-coroutines-core-jvm
|
name: kotlinx-coroutines-core-jvm
|
||||||
copyrightHolder: JetBrains s.r.o. and contributors
|
copyrightHolder: JetBrains s.r.o. and contributors
|
||||||
|
@ -767,16 +757,6 @@
|
||||||
license: The Apache Software License, Version 2.0
|
license: The Apache Software License, Version 2.0
|
||||||
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
|
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||||
url: https://developer.android.com/jetpack/androidx
|
url: https://developer.android.com/jetpack/androidx
|
||||||
- artifact: androidx.databinding:databinding-adapters:+
|
|
||||||
name: databinding-adapters
|
|
||||||
copyrightHolder: Google Inc
|
|
||||||
license: The Apache Software License, Version 2.0
|
|
||||||
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
|
|
||||||
- artifact: androidx.databinding:databinding-runtime:+
|
|
||||||
name: databinding-runtime
|
|
||||||
copyrightHolder: Google Inc
|
|
||||||
license: The Apache Software License, Version 2.0
|
|
||||||
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
|
|
||||||
- artifact: androidx.databinding:databinding-common:+
|
- artifact: androidx.databinding:databinding-common:+
|
||||||
name: databinding-common
|
name: databinding-common
|
||||||
copyrightHolder: Google Inc
|
copyrightHolder: Google Inc
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
package="org.pixeldroid.app">
|
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -296,6 +296,7 @@ class PhotoEditActivity : BaseThemedWithBarActivity() {
|
||||||
uCrop.start(this)
|
uCrop.start(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated("Deprecated in Java")
|
||||||
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
||||||
super.onActivityResult(requestCode, resultCode, data)
|
super.onActivityResult(requestCode, resultCode, data)
|
||||||
if(resultCode == Activity.RESULT_OK) {
|
if(resultCode == Activity.RESULT_OK) {
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.7.0'
|
ext.kotlin_version = '1.7.10'
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.3.0-beta05'
|
classpath 'com.android.tools.build:gradle:7.3.0-rc01'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue