Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Nussbaumer <stefan@basislager.org>
  • Loading branch information
nuss committed Nov 8, 2023
1 parent 839705e commit 6150d4b
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 18 deletions.
14 changes: 7 additions & 7 deletions app/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 32
compileSdkVersion 33
buildToolsVersion '33.0'
defaultConfig {
applicationId "net.videosc"
minSdkVersion 16
targetSdkVersion 32
targetSdkVersion 33
versionCode 19
versionName "2.0alpha4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -26,12 +26,12 @@ android {

dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation "androidx.recyclerview:recyclerview:1.2.1"
implementation 'androidx.recyclerview:recyclerview:1.3.1'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(path: ':netP5android')
implementation project(path: ':oscP5android')
// implementation 'com.google.android.gms:play-services-oss-licenses:16.0.2'
androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', {
androidTestImplementation('androidx.test.espresso:espresso-core:3.5.1', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation "com.cleveroad:adaptivetablelayout:1.2.1"
Expand All @@ -40,14 +40,14 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:2.12.0'
testImplementation 'org.mockito:mockito-core:5.2.0'
// androidTestImplementation 'org.mockito:mockito-android:2.12.0'
implementation files('libs/android-core.jar')
implementation files('libs/Ketai.jar')
// implementation files('libs/oscP5.jar')
implementation 'jp.co.cyberagent.android:gpuimage:2.1.0'
implementation 'com.google.android.material:material:1.8.0'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
implementation 'com.google.android.material:material:1.9.0'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
testImplementation 'org.robolectric:robolectric:4.5.1'
androidTestImplementation 'androidx.test:rules:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
Expand Down
Expand Up @@ -1216,8 +1216,8 @@ private Rect getCurrentPixelRect(int pixelId) {
return new Rect(left, top, right, bottom);
}

// set the preview fps range and update framerate immediately
// format, w, h must be passed in explicitely as they're demanded by surfaceChanged()
// set the preview fps range and update frame rate immediately
// format, w, h must be passed in explicitly as they're demanded by surfaceChanged()
private void setPreviewFpsRange(Camera.Parameters params, int[] range, int format, int w, int h) {
params.setPreviewFpsRange(range[0], range[1]);
surfaceChanged(mHolder, format, w, h);
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.1.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -20,6 +20,6 @@ allprojects {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}
3 changes: 3 additions & 0 deletions gradle.properties
Expand Up @@ -6,7 +6,10 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Thu May 06 22:34:46 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions netP5android/build.gradle
Expand Up @@ -3,12 +3,12 @@ plugins {
}

android {
compileSdkVersion 32
compileSdkVersion 33
buildToolsVersion "33.0"

defaultConfig {
minSdkVersion 16
targetSdkVersion 32
targetSdkVersion 33

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -30,7 +30,7 @@ android {
dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'com.google.android.material:material:1.9.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down
6 changes: 3 additions & 3 deletions oscP5android/build.gradle
Expand Up @@ -3,12 +3,12 @@ plugins {
}

android {
compileSdkVersion 32
compileSdkVersion 33
buildToolsVersion "33.0"

defaultConfig {
minSdkVersion 16
targetSdkVersion 32
targetSdkVersion 33

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -30,7 +30,7 @@ android {
dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'com.google.android.material:material:1.9.0'
implementation project(path: ':netP5android')
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand Down

0 comments on commit 6150d4b

Please sign in to comment.