Upgrade gradle

This commit is contained in:
edr
2023-10-01 21:43:17 +02:00
parent 9d052fae2f
commit 37b21ad495
4 changed files with 9 additions and 11 deletions

View File

@@ -1,6 +1,5 @@
<?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"
package="de.rochefort.childmonitor"
android:versionCode="2" android:versionCode="2"
android:versionName="0.2" > android:versionName="0.2" >
@@ -17,9 +16,8 @@
android:theme="@android:style/Theme.Holo" > android:theme="@android:style/Theme.Holo" >
<activity <activity
android:name="de.rochefort.childmonitor.StartActivity" android:name="de.rochefort.childmonitor.StartActivity"
android:label="@string/app_name"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
@@ -27,20 +25,17 @@
</activity> </activity>
<activity <activity
android:name="de.rochefort.childmonitor.MonitorActivity" android:name="de.rochefort.childmonitor.MonitorActivity"
android:label="@string/app_name"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:parentActivityName="de.rochefort.childmonitor.StartActivity" android:parentActivityName="de.rochefort.childmonitor.StartActivity"
/> />
<activity <activity
android:name="de.rochefort.childmonitor.DiscoverActivity" android:name="de.rochefort.childmonitor.DiscoverActivity"
android:label="@string/app_name"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:windowSoftInputMode="adjustPan" android:windowSoftInputMode="adjustPan"
android:parentActivityName="de.rochefort.childmonitor.StartActivity" android:parentActivityName="de.rochefort.childmonitor.StartActivity"
/> />
<activity <activity
android:name="de.rochefort.childmonitor.ListenActivity" android:name="de.rochefort.childmonitor.ListenActivity"
android:label="@string/app_name"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:parentActivityName="de.rochefort.childmonitor.DiscoverActivity" android:parentActivityName="de.rochefort.childmonitor.DiscoverActivity"
/> />

View File

@@ -1,17 +1,17 @@
// 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 {
repositories { repositories {
jcenter() mavenCentral()
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.2.2' classpath 'com.android.tools.build:gradle:8.0.2'
} }
} }
allprojects { allprojects {
repositories { repositories {
jcenter() mavenCentral()
google() google()
} }
} }

View File

@@ -20,3 +20,6 @@
# The aapt2 tool creates an APK which fails to install on Android 5 and below if it contains # The aapt2 tool creates an APK which fails to install on Android 5 and below if it contains
# a bug. Build tools 27.0.1 has a mitigation. Avoiding aapt2 also avoids hitting the bug. # a bug. Build tools 27.0.1 has a mitigation. Avoiding aapt2 also avoids hitting the bug.
# See: https://issuetracker.google.com/issues/64434571 # See: https://issuetracker.google.com/issues/64434571
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false

View File

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
distributionSha256Sum=22449f5231796abd892c98b2a07c9ceebe4688d192cd2d6763f8e3bf8acbedeb distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01