Skip to content

Commit

Permalink
Update dependencies, use SDK 31
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ch4t4r
Ch4t4r committed Dec 21, 2021
1 parent 3df84a5 commit cd541aa
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 19 deletions.
32 changes: 16 additions & 16 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ apply plugin: 'kotlin-kapt'
def debugKeyPath = new File(System.properties['user.home'], ".android/debug.keystore")

android {
compileSdkVersion 30
compileSdkVersion 31
defaultConfig {
applicationId "com.frostnerd.smokescreen"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31
versionCode 80
versionName "2.1.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -144,18 +144,18 @@ android {
// }
//}

def frostnerdLifecycleVersion = "1.2.4"
def frostnerdPreferencesVersion = "1.5.33"
def frostnerdNavigationVersion = "1.4.5"
def frostnerdDnsProxyVersion = "2.21"
def frostnerdGeneralVersion = "1.0.28"
def frostnerdAdaptersVersion = "1.3.8"
def frostnerdLifecycleVersion = "1.2.5"
def frostnerdPreferencesVersion = "1.5.35"
def frostnerdNavigationVersion = "1.4.7"
def frostnerdDnsProxyVersion = "2.2.2"
def frostnerdGeneralVersion = "1.0.29"
def frostnerdAdaptersVersion = "1.3.10"

// TODO Clone, build & publishToMavenLocal for libraries with versions defined above for fdroidofficial flavor
// for https://gitlab.com/fdroid/fdroiddata/-/merge_requests/9142

dependencies {
def room_version = "2.3.0"
def room_version = "2.4.0"

implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
Expand All @@ -170,14 +170,14 @@ dependencies {
implementation "com.frostnerd.utilskt:general:$frostnerdGeneralVersion" // https://git.frostnerd.com/AndroidUtils/generalkt
implementation "com.frostnerd.utilskt:adapters:$frostnerdAdaptersVersion" // https://git.frostnerd.com/AndroidUtils/Adapters

storeImplementation 'com.google.android.gms:play-services-cronet:17.0.1'
fdroidImplementation 'com.google.android.gms:play-services-cronet:17.0.1'
storeImplementation 'com.google.android.gms:play-services-cronet:18.0.0'
fdroidImplementation 'com.google.android.gms:play-services-cronet:18.0.0'

implementation 'androidx.work:work-runtime:2.7.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.work:work-runtime:2.7.1'
implementation 'androidx.appcompat:appcompat:1.4.0'
implementation "androidx.preference:preference:1.1.1"
implementation "com.google.android.material:material:1.4.0"
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0-alpha01'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0-rc01'
implementation "androidx.core:core-ktx:1.7.0"

implementation "androidx.room:room-runtime:$room_version"
Expand All @@ -191,8 +191,8 @@ dependencies {

leakCanaryImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'

implementation "com.squareup.okhttp3:okhttp:4.9.2"
implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.2'
implementation "com.squareup.okhttp3:okhttp:4.9.3"
implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
implementation 'com.github.AppIntro:AppIntro:6.1.0'

storeImplementation 'com.google.android.play:core:1.10.2'
Expand Down
11 changes: 11 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<activity
android:name=".activity.PinActivity"
android:launchMode="singleTask"
android:exported="true"
android:theme="@style/Theme.AppCompat.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -59,6 +60,7 @@
</intent-filter>
</activity>
<activity
android:exported="false"
android:name=".activity.NebuloAppIntro"
android:label="@string/app_name" />

Expand All @@ -71,6 +73,7 @@
<activity
android:name=".activity.SettingsActivity"
android:label="@string/menu_settings"
android:exported="false"
android:theme="@style/AppTheme_Mono_ActionBar">

</activity>
Expand All @@ -87,6 +90,7 @@
android:autoRemoveFromRecents="true"
android:label="@string/activity_label_enable_logging"
android:noHistory="true"
android:exported="true"
android:process=":logexport"
android:theme="@style/Theme.AppCompat.Light.Dialog.Alert">
<intent-filter>
Expand Down Expand Up @@ -117,6 +121,7 @@
android:autoRemoveFromRecents="true"
android:label="@string/activity_label_import_servers"
android:noHistory="true"
android:exported="true"
android:theme="@style/Theme.AppCompat.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
Expand Down Expand Up @@ -182,6 +187,7 @@
android:autoRemoveFromRecents="true"
android:label="@string/activity_label_import_queries"
android:noHistory="true"
android:exported="true"
android:theme="@style/Theme.AppCompat.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
Expand All @@ -199,6 +205,7 @@
android:name=".activity.ImportSettingsActivity"
android:autoRemoveFromRecents="true"
android:noHistory="true"
android:exported="true"
android:theme="@style/Theme.AppCompat.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
Expand Down Expand Up @@ -226,12 +233,14 @@
<activity
android:name=".activity.BackgroundVpnConfigureActivity"
android:launchMode="singleInstance"
android:exported="false"
android:theme="@style/Theme.AppCompat.Light.Dialog.Alert" />
<activity
android:name=".activity.ErrorDialogActivity"
android:autoRemoveFromRecents="true"
android:clearTaskOnLaunch="true"
android:excludeFromRecents="true"
android:exported="false"
android:launchMode="singleTop"
android:noHistory="true"
android:process=".ErrorProcess"
Expand Down Expand Up @@ -260,6 +269,7 @@

<service
android:name=".service.DnsVpnService"
android:exported="true"
android:permission="android.permission.BIND_VPN_SERVICE"
android:stopWithTask="false">
<intent-filter>
Expand All @@ -273,6 +283,7 @@
android:name=".service.VpnRestartService"
android:exported="false" />
<service
android:exported="true"
android:name=".service.StartStopTileService"
android:icon="@drawable/ic_mainnotification"
android:label="@string/app_name"
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ ext.nexus_password = getNexusPassword()

buildscript {
ext {
ext.KOTLIN_VERSION = '1.5.31'
ext.KOTLIN_VERSION = '1.6.10'
}
ext.ANDROID_COMPILE_SDK = (System.getenv("ANDROID_COMPILE_SDK") == null ? 31 : System.getenv("ANDROID_COMPILE_SDK")).toInteger()
ext.ANDROID_TARGET_SDK = (System.getenv("ANDROID_TARGET_SDK") == null ? ANDROID_COMPILE_SDK : System.getenv("ANDROID_TARGET_SDK")).toInteger()
ext.ANDROID_MIN_SDK = (System.getenv("ANDROID_MIN_SDK") == null ? 14 : System.getenv("ANDROID_COMPILE_SDK")).toInteger()
ext.ANDROID_GRADLE_PLUGIN_VERSION = System.getenv("ANDROID_GRADLE_PLUGIN_VERSION") == null ? "7.0.3" : System.getenv("ANDROID_GRADLE_PLUGIN_VERSION")
ext.ANDROID_GRADLE_PLUGIN_VERSION = System.getenv("ANDROID_GRADLE_PLUGIN_VERSION") == null ? "7.0.4" : System.getenv("ANDROID_GRADLE_PLUGIN_VERSION")

println "COMPILE SDK Version: $ANDROID_COMPILE_SDK"
println "TARGET SDK Version: $ANDROID_TARGET_SDK"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit cd541aa

Please sign in to comment.