build: bump dependency

This commit is contained in:
inotia00 2023-03-06 11:00:01 +09:00
commit a83ef6cb12
20 changed files with 52 additions and 129 deletions

View file

@ -4,27 +4,27 @@
*/
buildscript {
ext.kotlinVersion = '1.7.20'
ext.kotlinVersion = '1.8.0'
ext.coroutineVersion = '1.6.4'
ext.annotationVersion = '1.5.0'
ext.appcompatVersion = '1.5.1'
ext.annotationVersion = '1.6.0'
ext.appcompatVersion = '1.6.1'
ext.coreVersion = '1.9.0'
ext.collectionVersion = '1.3.0-dev01'
ext.fragmentVersion = '1.5.5'
ext.lifecycleVersion = '2.5.1'
ext.materialVersion = '1.7.0'
ext.materialVersion = '1.8.0'
ext.navigationVersion = '2.5.3'
ext.preferenceVersion = '1.2.0'
ext.webkitVersion = '1.5.0'
ext.webkitVersion = '1.6.0'
ext.circleimageviewVersion = '3.1.0'
ext.volleyVersion = '1.2.1'
ext.wireVersion = '4.4.3'
ext.wireVersion = '4.5.1'
ext.androidBuildGradleVersion = '7.3.1'
ext.androidBuildVersionTools = '33.0.1'
ext.androidBuildGradleVersion = '7.4.2'
ext.androidBuildVersionTools = '33.0.2'
ext.androidMinSdk = 23
ext.androidTargetSdk = 29

View file

@ -1,6 +1,6 @@
#Mon Dec 22 22:27:19 CET 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

View file

@ -17,8 +17,8 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion androidCompileSdk
buildToolsVersion androidBuildVersionTools
compileSdk androidCompileSdk
buildToolsVersion '33.0.2'
defaultConfig {
minSdkVersion androidMinSdk
@ -26,9 +26,10 @@ android {
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11
}
namespace 'org.microg.gms.api'
}
dependencies {

View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2013-2017 microG Project Team
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<manifest package="org.microg.gms.api"/>

View file

@ -34,7 +34,8 @@ android {
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11
}
namespace 'org.microg.gms.base.api'
}

View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2020, microG Project Team
~ SPDX-License-Identifier: Apache-2.0
-->
<manifest package="org.microg.gms.base.api"/>

View file

@ -21,7 +21,6 @@ android {
buildToolsVersion androidBuildVersionTools
defaultConfig {
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
}
@ -31,7 +30,8 @@ android {
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11
}
namespace 'org.microg.gms.base.core'
}

View file

@ -3,7 +3,7 @@
~ SPDX-FileCopyrightText: 2020, microG Project Team
~ SPDX-License-Identifier: Apache-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.microg.gms.base.core">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<provider
android:name="org.microg.mgms.settings.SettingsProvider"

View file

@ -26,9 +26,10 @@ android {
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11
}
namespace 'org.microg.gms.base'
}
dependencies {

View file

@ -15,8 +15,7 @@
~ limitations under the License.
-->
<manifest package="org.microg.gms.base"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<meta-data

View file

@ -22,8 +22,8 @@ dependencies {
// Dependencies from play-services-basement:18.0.0
api "androidx.collection:collection:$collectionVersion"
api "androidx.core:core:$coreVersion"
api "androidx.fragment:fragment:$fragmentVersion"
api "androidx.core:core-ktx:$coreVersion"
api "androidx.fragment:fragment-ktx:$fragmentVersion"
}
android {
@ -50,7 +50,8 @@ android {
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11
}
namespace 'org.microg.gms.basement'
}

View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2013-2017 microG Project Team
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<manifest package="org.microg.gms.basement"/>

View file

@ -21,9 +21,9 @@ sourceSets {
}
compileKotlin {
kotlinOptions.jvmTarget = 1.8
kotlinOptions.jvmTarget = 11
}
compileTestKotlin {
kotlinOptions.jvmTarget = 1.8
kotlinOptions.jvmTarget = 11
}

View file

@ -75,9 +75,6 @@ android {
}
}
lintOptions {
disable 'MissingTranslation', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'Range'
}
buildTypes {
release {
@ -87,16 +84,22 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
packagingOptions {
exclude 'META-INF/ASL2.0'
jniLibs {
useLegacyPackaging false
}
resources {
excludes += ['META-INF/ASL2.0']
}
}
lint {
disable 'MissingTranslation', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'Range'
}
namespace 'com.mgoogle.android.gms'
}
if (file('user.gradle').exists()) {

View file

@ -26,14 +26,14 @@ android {
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11
}
lintOptions {
// TODO: Remove MissingTranslation once we have stable strings and proper translations.
lint {
disable 'MissingTranslation'
}
namespace 'org.microg.tools.ui'
}
dependencies {

View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2013-2017 microG Project Team
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<manifest package="org.microg.tools.ui" />

View file

@ -26,9 +26,10 @@ android {
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11
}
namespace 'org.microg.gms.iid.api'
}
dependencies {

View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2013-2017 microG Project Team
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<manifest package="org.microg.gms.iid.api"/>

View file

@ -22,9 +22,10 @@ android {
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11
}
namespace 'org.microg.gms.tasks'
}
dependencies {

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2020, microG Project Team
~ SPDX-License-Identifier: Apache-2.0
-->
<manifest package="org.microg.gms.tasks"/>