Skip to content
This repository has been archived by the owner on Jan 10, 2024. It is now read-only.

Upgrade to SDK 33 #1602

Merged
merged 4 commits into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'adopt'
- name: Build
run: ./gradlew build
11 changes: 6 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'de.aaschmid.cpd' version '3.1'
id 'de.aaschmid.cpd' version '3.3'
}
// apply plugin: "io.gitlab.arturbosch.detekt"
apply plugin: 'com.android.application'
Expand All @@ -17,7 +17,8 @@ apply from: '../gradle/scripts/checkstyle.gradle'
apply from: '../gradle/scripts/testLogging.gradle'

android {
compileSdkVersion 32
compileSdk 33
namespace "de.tum.in.tumcampusapp"
buildTypes {
all {
proguardFiles(file('../proguard').listFiles())
Expand All @@ -37,9 +38,9 @@ android {
defaultConfig {
applicationId "de.tum.in.tumcampus"
minSdkVersion 26
targetSdkVersion 32
versionCode 587
versionName "4.2-dev"
targetSdkVersion 33
versionCode 588
versionName "4.3-dev"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

Expand Down
4 changes: 1 addition & 3 deletions app/src/androidTest/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:tools="http://schemas.android.com/tools"
package="de.tum.in.tumcampusapp">

<manifest xmlns:tools="http://schemas.android.com/tools">
<uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/>
</manifest>
1 change: 0 additions & 1 deletion app/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="de.tum.in.tumcampusapp"
android:installLocation="auto"
tools:ignore="UnusedAttribute">
<!-- Standard access rights -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ val Menu.allItems: List<MenuItem>
get() {
return items.flatMap { item ->
if (item.hasSubMenu()) {
item.subMenu.allItems
item.subMenu!!.allItems
} else {
listOf(item)
}
Expand Down