Skip to content

Commit

Permalink
chore: update dependencies & temp disable CI (#77)
Browse files Browse the repository at this point in the history
* chore: update dependencies

* chore: disable PR CI
  • Loading branch information
BeksOmega committed Apr 1, 2023
1 parent 013bd41 commit 8d10d23
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 40 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/pull_request.yml
@@ -1,10 +1,10 @@
name: Pull Request CI

on:
pull_request:
branches:
- 'develop'
- 'master'
#on:
# pull_request:
# branches:
# - 'develop'
# - 'master'

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.72'
ext.kotlin_version = '1.8.0'

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"


Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
15 changes: 6 additions & 9 deletions library/build.gradle
@@ -1,17 +1,14 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-parcelize'
apply from: 'maven-push.gradle'

android {
compileSdkVersion 30
buildToolsVersion "29.0.2"
compileSdkVersion 33

defaultConfig {
minSdkVersion 21
targetSdkVersion 30
versionCode 1
versionName "1.0"
targetSdkVersion 33

consumerProguardFiles 'consumer-rules.pro'
}
Expand All @@ -22,13 +19,13 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
namespace 'com.bekawestberg.loopinglayout.library'

}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.recyclerview:recyclerview:1.3.0'
}

3 changes: 1 addition & 2 deletions library/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.bekawestberg.loopinglayout.library" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
29 changes: 14 additions & 15 deletions test/build.gradle
@@ -1,13 +1,12 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 30
compileSdkVersion 33
defaultConfig {
applicationId "com.example.bekawestberg.projectcontinuity"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 33
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -21,22 +20,22 @@ android {
pseudoLocalesEnabled true
}
}
namespace 'com.bekawestberg.loopinglayout.test'
}

dependencies {
implementation project(':library')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "androidx.core:core-ktx:1.3.2"
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
testImplementation 'junit:junit:4.13.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
implementation 'com.google.android.material:material:1.3.0'
implementation "androidx.core:core-ktx:1.9.0"
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.3.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
implementation 'com.google.android.material:material:1.8.0'
}
repositories {
mavenCentral()
Expand Down
Expand Up @@ -86,7 +86,7 @@ object ViewAssertions {
.withViewMatcher(toView)
.withView1(matchedView)
.withView2(matchedViewIterator.next())
.withOtherAmbiguousViews(*Iterators.toArray(matchedViewIterator, View::class.java))
.withOtherAmbiguousViews(*(Iterators.toArray(matchedViewIterator, View::class.java) as Array<out View>))
.build()
} else {
matchedView = matchedViewIterator.next()
Expand Down
9 changes: 4 additions & 5 deletions test/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.bekawestberg.loopinglayout.test">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand All @@ -9,21 +8,21 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name="ActivityVertical">
<activity android:name="ActivityVertical" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="ActivityHorizontal">
<activity android:name="ActivityHorizontal" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="ActivityGeneric">
<activity android:name="ActivityGeneric" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

Expand Down

0 comments on commit 8d10d23

Please sign in to comment.