Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Gedsh committed May 29, 2023
1 parent e119411 commit e68f27a
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion android-filepicker
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"


Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ android.enableJetifier=true
# org.gradle.parallel=true
kotlin.code.style=official
kotlin.caching.enabled=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
#org.gradle.unsafe.configuration-cache=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01
11 changes: 6 additions & 5 deletions tordnscrypt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {
android {
compileSdkVersion 33

namespace 'pan.alexander.tordnscrypt'

flavorDimensions "version", "processor"

Expand Down Expand Up @@ -81,8 +82,8 @@ android {
}

compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 17
targetCompatibility = 17
}
buildToolsVersion = '30.0.3'

Expand Down Expand Up @@ -131,7 +132,7 @@ android {
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}

}
Expand All @@ -145,7 +146,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.8.0'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.3.0'
implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
Expand All @@ -156,7 +157,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'eu.chainfire:libsuperuser:1.1.1'
implementation 'com.jrummyapps:android-shell:1.0.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation project(':filepicker')
Expand Down
11 changes: 6 additions & 5 deletions tordnscrypt/owner.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
android {
compileSdkVersion 33

namespace 'pan.alexander.tordnscrypt'

flavorDimensions "version", "processor"

Expand Down Expand Up @@ -123,8 +124,8 @@ android {
}
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 17
targetCompatibility = 17
}
buildToolsVersion = '30.0.3'

Expand Down Expand Up @@ -171,7 +172,7 @@ android {
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}

}
Expand All @@ -187,7 +188,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.8.0'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.3.0'
implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
Expand All @@ -199,7 +200,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'eu.chainfire:libsuperuser:1.1.1'
implementation 'com.jrummyapps:android-shell:1.0.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
implementation project(':filepicker')

Expand Down
1 change: 0 additions & 1 deletion tordnscrypt/src/fdroid/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="pan.alexander.tordnscrypt"
android:installLocation="internalOnly"
android:targetSandboxVersion="1"
tools:targetApi="o">
Expand Down
1 change: 0 additions & 1 deletion tordnscrypt/src/google_play/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="pan.alexander.tordnscrypt"
android:installLocation="internalOnly"
android:targetSandboxVersion="1"
tools:targetApi="o">
Expand Down
1 change: 0 additions & 1 deletion tordnscrypt/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="pan.alexander.tordnscrypt"
android:installLocation="internalOnly"
android:targetSandboxVersion="1"
tools:targetApi="o">
Expand Down

0 comments on commit e68f27a

Please sign in to comment.