Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump gradle and sdk target #13

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

chore: bump gradle and sdk target #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc00640
chore: bump gradle
invertedEcho Jan 25, 2024
ece7474
fix: target sdk version 34
invertedEcho Jan 25, 2024
024a384
chore: bump gradle to v8.2.2
invertedEcho Jan 25, 2024
8e3fd70
revert: changes needed for upgrading from old to newer version of gradle
invertedEcho Jan 25, 2024
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
7 changes: 3 additions & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ allprojects {
}

android {
compileSdkVersion 30
buildToolsVersion buildToolsVersion

defaultConfig {
compileSdk 34
applicationId "de.visorapp.visoropensource"
minSdkVersion 14
targetSdkVersion 30
targetSdkVersion 34
versionCode 3
versionName "1.6"
}
Expand All @@ -53,6 +51,7 @@ android {
zipAlignEnabled true
}
}
namespace 'de.visorapp.visor'
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.visorapp.visor">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- access the camera -->
<uses-permission android:name="android.permission.CAMERA" />
<!--
Expand Down Expand Up @@ -30,6 +29,7 @@
android:name=".SettingsActivity"
android:label="@string/title_activity_settings"></activity>
<activity
android:exported="true"
Copy link
Author

@invertedEcho invertedEcho Jan 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is needed for activities using intent-filters in apps that target android version 12 or higher. See information here:
https://developer.android.com/guide/topics/manifest/activity-element#exported
It allows other apps to launch this activity.

android:name=".VisorActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/app_name"
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ext {
}

buildscript {
ext.kotlin_version = '1.4.21'
ext.kotlin_version = '1.6.21'
repositories {
jcenter()
maven {
Expand All @@ -13,7 +13,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.1'
classpath 'com.android.tools.build:gradle:8.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
org.gradle.parallel=true
android.enableJetifier=true
android.useAndroidX=true
android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sun Dec 20 23:01:21 CET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
Loading