Skip to content

Commit 5d1261d

Browse files
committed
Start of version 2 compatibility
1 parent 207057c commit 5d1261d

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Introduction
22

3-
[![Build Status](https://travis-ci.com/drupalauth/simplesamlphp-module-drupalauth.svg?branch=master)](https://travis-ci.com/drupalauth/simplesamlphp-module-drupalauth)
3+
[![Build Status](https://travis-ci.com/drupalauth/simplesamlphp-module-drupalauth.svg?branch=main)](https://travis-ci.com/drupalauth/simplesamlphp-module-drupalauth)
44

55
Drupal + SimpleSAMLphp + drupalauth = Complete SAML Identity Provider (IdP)
66

@@ -32,9 +32,10 @@ So in a X.Y.Z version:
3232
- Y - major Drupal version
3333
- Z - inthis module incremental version
3434

35-
Example: for SimpleSAMLphp version 1.15.4 with Drupal version 8.5.6 and this module version 1 we will have tag 1.8.1. Same thing for Drupal 7 will be 1.7.1.
35+
Example: for SimpleSAMLphp version 1.15.4 with Drupal version 8.5.6 and this module version 1 we will have tag 1.8.1.
36+
Same thing for Drupal 7 will be 1.7.1.
3637

37-
`master` at the moment corresponds to 1.8.*. Branch `1.7` is respectfully for Drupal 7 (not composer integration yet).
38+
`main` at the moment corresponds to `2.10.*`. Branch `1.7` is respectfully for Drupal 7 (no Composer integration).
3839

3940
## Note on Drupal configuration
4041

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
],
2323
"require": {
2424
"php": "^5.6.0|^7.0|^8.0",
25-
"simplesamlphp/simplesamlphp": "~1.0",
25+
"simplesamlphp/simplesamlphp": "~2.0",
2626
"simplesamlphp/composer-module-installer": "~1.0"
2727
},
2828
"require-dev": {
@@ -34,7 +34,7 @@
3434
},
3535
"extra": {
3636
"branch-alias": {
37-
"dev-master": "1.9.x-dev"
37+
"dev-main": "2.10.x-dev"
3838
}
3939
},
4040
"config": {

0 commit comments

Comments
 (0)