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

Commit 892f3db

Browse files
authored
Upgrade to SDK 33 and release 4.2 (#1602)
* Upgrade to SDK 33. Move namespace to build file. * Update to JDK 17 in gh actions. * Revert upgrade to Gradle 8, Retrofit still doesn't support this. * Release version 4.2
1 parent 377cc3b commit 892f3db

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

.github/workflows/branches.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ jobs:
1717
steps:
1818
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
1919
- uses: actions/checkout@v3
20-
20+
- name: Set up JDK 17
21+
uses: actions/setup-java@v3
22+
with:
23+
java-version: '17'
24+
distribution: 'adopt'
2125
- name: Build
2226
run: ./gradlew build

app/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'de.aaschmid.cpd' version '3.1'
2+
id 'de.aaschmid.cpd' version '3.3'
33
}
44
// apply plugin: "io.gitlab.arturbosch.detekt"
55
apply plugin: 'com.android.application'
@@ -17,7 +17,8 @@ apply from: '../gradle/scripts/checkstyle.gradle'
1717
apply from: '../gradle/scripts/testLogging.gradle'
1818

1919
android {
20-
compileSdkVersion 32
20+
compileSdk 33
21+
namespace "de.tum.in.tumcampusapp"
2122
buildTypes {
2223
all {
2324
proguardFiles(file('../proguard').listFiles())
@@ -37,9 +38,9 @@ android {
3738
defaultConfig {
3839
applicationId "de.tum.in.tumcampus"
3940
minSdkVersion 26
40-
targetSdkVersion 32
41-
versionCode 587
42-
versionName "4.2-dev"
41+
targetSdkVersion 33
42+
versionCode 588
43+
versionName "4.3-dev"
4344

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:tools="http://schemas.android.com/tools"
3-
package="de.tum.in.tumcampusapp">
4-
2+
<manifest xmlns:tools="http://schemas.android.com/tools">
53
<uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/>
64
</manifest>

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
package="de.tum.in.tumcampusapp"
54
android:installLocation="auto"
65
tools:ignore="UnusedAttribute">
76
<!-- Standard access rights -->

app/src/main/java/de/tum/in/tumcampusapp/utils/Extensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ val Menu.allItems: List<MenuItem>
5555
get() {
5656
return items.flatMap { item ->
5757
if (item.hasSubMenu()) {
58-
item.subMenu.allItems
58+
item.subMenu!!.allItems
5959
} else {
6060
listOf(item)
6161
}

0 commit comments

Comments
 (0)