diff --git a/build.gradle b/build.gradle index 54ffae9..e59e450 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,13 @@ buildscript { jcenter() mavenCentral() } - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.3.0-alpha06' + } + repositories { + maven { + url 'https://maven.google.com/' + name 'Google' + } } } @@ -12,6 +18,10 @@ allprojects { repositories { jcenter() mavenLocal() + maven { + url 'https://maven.google.com/' + name 'Google' + } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5efdcec..bf88784 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 03 06:57:42 CEST 2016 +#Fri Aug 24 16:29:24 PDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index 845a762..e829aeb 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 28 + buildToolsVersion '28.0.2' defaultConfig { applicationId "ffmpeg.videokit.sample" - minSdkVersion 10 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 28 versionCode 3 versionName "1.1.0" } @@ -20,11 +20,12 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.1.1' - compile 'com.android.support:design:25.1.1' - compile project(':videokit') + implementation fileTree(include: ['*.jar'], dir: 'libs') + testImplementation 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:28.0.0-rc01' + implementation 'com.android.support:support-v4:28.0.0-rc01' + implementation 'com.android.support:design:28.0.0-rc01' + implementation project(':videokit') //compile 'com.infullmobile.android:videokit-release:1.1.0' } diff --git a/videokit/build.gradle b/videokit/build.gradle index a337319..7ac624b 100644 --- a/videokit/build.gradle +++ b/videokit/build.gradle @@ -67,12 +67,12 @@ task("publishIFMPublic", dependsOn: "publishMavenPublicationToIFMPublicReleaseRe } android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 28 + buildToolsVersion '28.0.2' defaultConfig { - minSdkVersion 10 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 28 versionCode 3 versionName "1.1.2" } @@ -99,9 +99,9 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') + implementation fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - testCompile 'org.mockito:mockito-core:1.10.19' + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-core:1.10.19' }