diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml index be77e3b..b4ef0f7 100644 --- a/.github/workflows/Android-CI-release.yml +++ b/.github/workflows/Android-CI-release.yml @@ -17,7 +17,7 @@ jobs: - name: Install JDK ${{ matrix.java_version }} uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Install Android SDK uses: malinskiy/action-android/install-sdk@release/0.1.1 - name: Decrypt keystore diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml index eb60ba9..d288dbd 100644 --- a/.github/workflows/Android-CI.yml +++ b/.github/workflows/Android-CI.yml @@ -8,7 +8,7 @@ jobs: runs-on: macOS-latest strategy: matrix: - java_version: [1.8] + java_version: [ 11.0.3 ] steps: - name: Checkout uses: actions/checkout@v2.3.4 @@ -68,10 +68,10 @@ jobs: uses: actions/checkout@v2.3.4 with: fetch-depth: 0 - - name: Install JDK 1.8 + - name: Install JDK 11.0.3 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11.0.3 - name: Install Android SDK uses: malinskiy/action-android/install-sdk@release/0.1.1 - name: Decrypt keystore diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 0d15693..88ea3aa 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,22 +1,7 @@ - - + @@ -130,5 +115,8 @@ + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index abd0e73..a4dcef9 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,10 @@ buildscript { ext.kotlin_version = '1.4.31' repositories { google() - jcenter() - + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:7.0.0-alpha08' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } @@ -15,7 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven { url 'https://jitpack.io' } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a56324..442d913 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/library/build.gradle b/library/build.gradle index 832f683..d026867 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'com.github.dcendents.android-maven' android { compileSdkVersion 30