diff --git a/.gitignore b/.gitignore index 39fb081..2cab035 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,56 @@ +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ and Plugins *.iml -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/misc.xml +.idea/dictionaries +.idea/libraries +.idea/caches +.idea/shelf/ +.idea/dbnavigator.xml +.idea + +# Generated Native libraries .externalNativeBuild + +# Import summary logs +import-summary.txt + +# Reports +reports/ diff --git a/build.gradle b/build.gradle index 91c13e6..16d4c6e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,26 +1,29 @@ buildscript { repositories { + google() jcenter() mavenCentral() - google() + maven { + url "https://jitpack.io" + } } dependencies { - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' -group='com.github.martoreto' +group = 'com.github.martoreto' android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' + compileSdkVersion 29 + defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 29 consumerProguardFiles 'proguard-rules.pro' externalNativeBuild { ndkBuild { @@ -47,8 +50,9 @@ android { repositories { google() + jcenter() } dependencies { - implementation 'com.android.support:support-annotations:27.0.2' + implementation 'androidx.annotation:annotation:1.1.0' } diff --git a/example/app/build.gradle b/example/app/build.gradle index fcd0573..b5c596e 100644 --- a/example/app/build.gradle +++ b/example/app/build.gradle @@ -1,11 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 29 + defaultConfig { applicationId "com.github.martoreto.opuscodecexample" minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -19,7 +20,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation project(':opuscodec') } diff --git a/example/app/src/main/java/com/github/martoreto/opuscodecexample/MainActivity.java b/example/app/src/main/java/com/github/martoreto/opuscodecexample/MainActivity.java index 2b463b2..2e867df 100644 --- a/example/app/src/main/java/com/github/martoreto/opuscodecexample/MainActivity.java +++ b/example/app/src/main/java/com/github/martoreto/opuscodecexample/MainActivity.java @@ -9,14 +9,15 @@ import android.media.MediaRecorder; import android.os.Bundle; import android.os.Process; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.Button; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + import com.score.rahasak.utils.OpusDecoder; import com.score.rahasak.utils.OpusEncoder; diff --git a/example/app/src/main/res/layout/activity_main.xml b/example/app/src/main/res/layout/activity_main.xml index 4ed25a1..a2f39f9 100644 --- a/example/app/src/main/res/layout/activity_main.xml +++ b/example/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - + diff --git a/example/build.gradle b/example/build.gradle index e6b32bc..9c3977b 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.4.2' // NOTE: Do not place your application dependencies here; they belong diff --git a/example/gradle.properties b/example/gradle.properties index aac7c9b..c73d239 100644 --- a/example/gradle.properties +++ b/example/gradle.properties @@ -1,17 +1,19 @@ # Project-wide Gradle settings. - # IDE (e.g. Android Studio) users: # Gradle settings configured through the IDE *will override* # any settings specified in this file. - # For more details on how to configure your build environment visit # 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. org.gradle.jvmargs=-Xmx1536m - # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true diff --git a/example/gradle/wrapper/gradle-wrapper.properties b/example/gradle/wrapper/gradle-wrapper.properties index ef2d4c5..06cbc8a 100644 --- a/example/gradle/wrapper/gradle-wrapper.properties +++ b/example/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 29 16:36:29 CET 2017 +#Tue Aug 20 09:56:05 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..c73d239 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,19 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# 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. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index de0e194..131af7d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 28 12:55:10 CEST 2017 +#Mon Aug 19 13:24:20 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/src/main/java/com/score/rahasak/utils/Annotations.java b/src/main/java/com/score/rahasak/utils/Annotations.java index 994d9f3..fde9c7c 100644 --- a/src/main/java/com/score/rahasak/utils/Annotations.java +++ b/src/main/java/com/score/rahasak/utils/Annotations.java @@ -1,6 +1,6 @@ package com.score.rahasak.utils; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/com/score/rahasak/utils/OpusEncoder.java b/src/main/java/com/score/rahasak/utils/OpusEncoder.java index b0e3c08..cb82ae3 100755 --- a/src/main/java/com/score/rahasak/utils/OpusEncoder.java +++ b/src/main/java/com/score/rahasak/utils/OpusEncoder.java @@ -1,7 +1,7 @@ package com.score.rahasak.utils; -import android.support.annotation.IntDef; -import android.support.annotation.IntRange; +import androidx.annotation.IntDef; +import androidx.annotation.IntRange; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy;